Skip to content
This repository has been archived by the owner on Feb 16, 2024. It is now read-only.

Artillery 1: Interdiction HARBLUN #18

Merged
merged 70 commits into from
Aug 22, 2023
Merged

Conversation

SagaStars
Copy link
Collaborator

ARTILLERIA UPDATE

Trae a hispania la primera maquinaria de artilleria (Combate Espacial), el interdiction. Una maquina para abordar otros navios.
Conformada por una consola de interdicion y un harblun linkeados entre si.

Conseguible:

  • En ramas de RD
  • En maquinas averiadas de un Waste Planet

Funciona gastando cantidades comicas de energia para establecer un enlace de bullshit bluespaciana que obliga a dockear la nave que has targeteado, necesitaras mantenerte a cerca de la nave linkeada y mantener una velocidad similar a la suya. Si la distancia u velocidad llegan a ser mayores de las aceptadas se cancelara el tether. En caso exitoso de haber logrado el tether, se dockeara forzadamente a la nave y quedara bloqueada en el espacio por un par de minutos dependiendo de que tan cercano fue su velocidad y diferencia de velocidad.

Tienes 3 tiers de los que elegir.

HARBLUN LOW-GAMMA

  • Rango - 1
    Tiempo de tether - 30 segundos (Mejores micro lasers puede bajar el tiempo de carga hasta 18,75 segundos)
    Tiempo de interdiction - 2:30 minutos (Mejores bins pueden llevarlo hasta 3:30 minutos)
    Carga electrica - 40000 (Mejores capacitadores pueden bajar la carga hasta 30000)

HARBLUN

  • Rango - 1
    Tiempo de tether - 15 segundos
    Tiempo de interdiction - 5 minutos
    Carga electrica - 100000
    • No tiene manera de mejorarse

HARBLUN MILITARY-GAMMA

  • Rango - 3
    Tiempo de tether - 15 segundos
    Tiempo de interdiction - 5 minutos
    Carga electrica - 125000
    • No tiene manera de mejorarse
    • No sufre consecuencias de diferencia de velocidad

CONSECUENCIAS DE INTERDICCIONES

Aunque usted no lo crea, el proceso de una interdiccion es bastante peligroso si no es hecho apropiadamente. Aqui hay algunas de sus posibles consecuencias.

[EN MITAD DE TETHER]

Consola obliterada
- 25% de energia fuera del APC del harblun, se disipa el tether.
Consola destruida
- 15% de energia fuera del APC del harblun, luces titilan, se disipa el tether.
Harblun obliterado
- 50% de energia fuera del APC del harblun, luces titilan, la nave es lanzada violentamente, se disipa el tether.
Harblun sin energia o destruido
- 25% de energia fuera del APC del harblun, luces titilan, todo se sacude un poco, se disipa el tether.
Falla de energia
- 15% de energia fuera del APC del harblun, luces titilan, se disipa el tether.

[EN MITAD DE INTERDICTION]

Harblun destruido
- 35% de energia fuera del APC del harblun, luces titilan, EXPLOTA, se disipa el interdiction.
Falla de energia
- 25% de energia fuera del APC del harblun, luces titilan, se disipa el interdiction.

CAMBIOS EN RD

La rama de Basic Shuttle Research

SPRITES

Screenshot_1

EJEMPLO
tLJM37Pmqg.mp4

Por que es bueno para el juego

El hiperespacio esta un poco cringe actualmente ya que funciona como safezone, quien no quiere peligro en la vida? Una de las interacciones mas banales que se pueden alcanzar. Guerra. Guerra. Sangre. Sangre

Apogee-dev and others added 30 commits July 23, 2023 20:36
<!-- 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

Removes the Metis from the game.

## Why It's Good For The Game

The Metis has been slated for removal for months now, pending a
replacement. A replacement has not been forthcoming, and, in the
meanwhile, the Metis continues to cause problems. If nothing else,
removing it should hopefully encourage a prompt replacement.

## Changelog

:cl:
del: Removed the Metis
/: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. -->
<!-- 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
redoes gas tanks
original was by imaginos, i repalleted it and touched it up, @CoiledLamb
did the rest , i touched the ones they did up a bit

## Why It's Good For The Game


![image](https://github.com/shiptest-ss13/Shiptest/assets/58402542/d0d2b2b9-7d00-4583-8ecd-4da245833588)

## Changelog

:cl: CoiledLamb, Imaginos16
add: resprites almost all of the atmospheric tank sprites
/: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. -->
)

<!-- 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
YOU! YES, **YOU**.

As a diligent citizen of the Most Serene Solar And Intersolar
Confederation, I'm sure you've had a situation where you needed to visit
a doctor! Perhaps you had a scraped knee? Some problem with your vision,
even? Or maybe, just *maybe*, you stumbled into a nuclear dump site in
some waste planet and you *foolishly* walked inside said site without a
hazmat suit on?

Well lucky for you, the Paracelsus-class Medical Corvette is here to
assist you JUST for this most-convenient occasion!
![2023-07-11 01 02
30](https://github.com/shiptest-ss13/Shiptest/assets/77556824/27324318-3ae1-49bd-9596-864986852c8f)
![2023-07-11 01 02
34](https://github.com/shiptest-ss13/Shiptest/assets/77556824/d4419faa-64e7-40f9-bd5e-d6407881a18a)

Boasting a crew composed of:

- One Captain
- One Bureaucrat
- Three Medical Doctors
- One Ship Engineer
- One Field Engineer
- Three Scribes

These most wonderful adventurers shall assist you in restoring your
physique to its natural state, before it was completely dashed by a
frontiersmen who was too smart with a combat shotgun! The ship's
faculties are also spacious, and made to encourage discourse and
camaraderie between fellow crewmembers! Dedicated rooms for medical
professionals to practice their specialties also exist, so they can
bring their full potential, in privacy or otherwise!

Now go out there, and help as many people as you can!*

(*Premiums may be liberally applied to non-solarian citizens)
 
<!-- 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
This is my first ship ever and I've done it with an extreme amount of
love, not just for this server, but also because I fucking love SolGov
and they desperately need more ships that aren't just the Chronicle.
Hopefully having an RP-oriented medical ship will encourage others to
read up on SolGov lore and have fun times there!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
add: Adds a SolGov medical ship, the Paracelsus-class!
/: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. -->
<!-- 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
Title!

This PR adds the missing SSG-669C Sniper Rifle to the game! Enjoy a 5
round bolt action weapon with all that armor piercing caseless goodness!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/dce69d7d-1ec4-420a-ae72-ecf3a93e4d23)

This PR also adds a new cosmetic item for Solarian Captains, a cloak!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/cacc38ed-3679-48e7-8a0f-f395b9274a9b)

Now you can successfully style on non-solarians!
<!-- 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
One was a missing item that was meant to be added in the original
solarian armory PR, and the other is a fun little cosmetic addition for
players to enjoy!
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy, Retlaw34
add: Adds the solarian SSG-669C Sniper Rifle!
add: Adds a cloak for the SolGov captain!
/: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. -->

---------

Signed-off-by: Imaginos16 <77556824+Imaginos16@users.noreply.github.com>
Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com>
<!-- 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
Removes some cruft we don't care about
<!-- 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
cruft
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Drip outfit is removed for being too crusty
del: Sec hailer sounds are gone
/: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. -->
…-ss13#2193)

<!-- 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
Removes:
* Bag of holding
* Bluespace bodybag
From RND designs
<!-- 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
These item breaks inventory balance in every conceivable way, with
little barrier to entry. Materials are abundant as things stand.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Bag of Holding is no longer researchable
del: Bluespace bodybag is no longer researchable
/: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. -->
<!-- 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

Removes Syndie headsets from Syndie job outfits that are not officers or
Twinkleshine crew, bringing the Syndie headset distribution in line with
other factions. Does not touch the maps themselves, so if spare headsets
need to be removed (and they should) this will have to be done
separately.

## Why It's Good For The Game

Faction radio channels are intended to function as something of a
faction-exclusive wideband, not a common channel for every member of the
faction to flood with minutiae. This is the same reason ships with
pre-built comms do not relay the common channel across the sector- Comms
spam sucks.

## Changelog

:cl:
balance: Removed Syndie headsets from non-officer jobs for parity with
other factions
/: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. -->
<!-- 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

Adds some missing perspective sprites for holofields so they match walls
in all directions. Additionally edits the animation direction to make it
consistent with shield direction.

## Why It's Good For The Game

consistency is good and effects matching our wall perspective is also
good

## Changelog

:cl:
fix: fixed mismatched perspective on east/west-facing holofield sprites
/: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. -->
<!-- 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
lol
<!-- 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
lmao
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
fix: mhelps should no longer take several minutes to send
/: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. -->
## About The Pull Request
The Aegis:
![2023-07-09 06 32
40](https://github.com/shiptest-ss13/Shiptest/assets/81540056/cf262257-1699-40e0-bcb1-6dc60f1e98a6)
I've touched up the central hallway's decals, they always bothered me
but at the time of the Aegis' creation, I wasn't as well versed with map
making as I am now. They're small tweaks that look better to me. The
smart fridge was removed and turned into a board, originally you could
access the smart fridge from outside of the ship, which wasn't intended.
Added some new posters. Compressed the number of red lockers down and
cleaned up the main hallway. I gave the psychologist a dart gun because
honestly, it sounded really funny.

![dart
riffle](https://github.com/shiptest-ss13/Shiptest/assets/81540056/eb10154a-1e28-4a5d-b41b-9b20f92b71a9)

Also, there are more seeds to make food with. There were like only two
food seeds and like five flowers before.

The Patient set:


![patient](https://github.com/shiptest-ss13/Shiptest/assets/81540056/65066ea3-92d1-4233-9bf6-a6448d43b11f)

Kepori and Vox versions are available. Long-term patients now spawn with
the white gown and slippers. The previous clothes they spawned with were
always intended to be replaced.

Hopefully, this PR also fixes long-term patients spawning with borked
ID's.

## Why It's Good For The Game

Fixing stuff, making stuff look better, and adding new RP opportunities
with clothes are good.

## Changelog

:cl: Drag
add: Adds a bunch of shit to the Aegis, nothing earth shattering
add: Added the patient set, along with Vox and Kepori compatible sprites
tweak: tweaked with the Aegis' decals
fix: (Hopefully) Fixes the Aegis' patient Id's
:cl:

---------

Signed-off-by: Thedragmeme <81540056+Draggeru@users.noreply.github.com>
Co-authored-by: thgvr <81882910+thgvr@users.noreply.github.com>
<!-- 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

Brings the Riggs up to par, primarily by adding a holofield to the cargo
bay. Additionally, some minor aesthetic and QoL updates were made.

- Adds holofield to cargo bay
- Replaces shuttle displays with ship viewscreens
- Tweaks wallmount positions for aesthetics
- Replaces the 10mm surplus rifle with a Winchester

## Why It's Good For The Game

keeping old ships up to snuff is always useful

## Changelog

:cl:
tweak: Updated the Riggs with a holofield and some visual polish
/: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. -->
<!-- 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
Originally when fox tails were added to shiptest, someone forgot to add
the new and correct idle frames for them.


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/a411b646-7359-45bc-a3ef-03d95f7fa105)

This has now been corrected
<!-- 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
Begone crust
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl: PositiveEntropy
imageadd: Fox tails have been successfully tweaked into what they were
supposed to look like
/: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. -->
<!-- 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
see title
<!-- 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
WHY SHIP NO SPAWN
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: toggle ship spawn now sends a message to players.
/: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. -->
actions-user and others added 17 commits July 29, 2023 10:27
<!-- 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
Someone will fix it eventually but for now that's not currently
happening
<!-- 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
It's too powerful
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: Nemo is admin spawn only
/: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. -->
This reverts commit e2b785b, reversing
changes made to b18ff0c.
<!-- 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 a couple of oversights from the colossus update. Adds bedsheets to
the beds in dorms and replaces the autolathe in the armory with a
security techfab. Also removes a single compact pickaxe.

## Why It's Good For The Game

<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
tweak: removed a single pickaxe from the Colossus
fix: added missing bedsheets and techfab to the Colossus
/: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. -->
<!-- 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

Brings the Toy C-20r smg in line with all of the foam weapons by giving
it the same firing sound as the rest. Removes the ability for it to be
suppressed for consistency as well. Changes "colorfull" in the rainbow
moth's description to the proper spelling of colorful.

## Why It's Good For The Game

Load up the Halftrack. Test out my foam guns and not have my eardrums
hurt from an overly loud "Toy" C-20r. Hug my favorite moth plushie buddy
and not cry at the extra l in their description. Life's good.

## Changelog

:cl:
tweak: Removed the ability for the Toy C-20r to accept a suppressor.
fix: Gave the Toy C-20r the proper firing sound.
spellcheck: Fixed the description of the rainbow moth.
/: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. -->

---------

Signed-off-by: Geoengi <139566513+Geoengi@users.noreply.github.com>
This reverts commit dc97b7a, reversing
changes made to 1da986c.
@SagaStars SagaStars added Artillery Combate espacial Feature arriba hispañita labels Aug 7, 2023
@SagaStars SagaStars merged commit e2569b2 into Helixis:master Aug 22, 2023
7 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Artillery Combate espacial Feature arriba hispañita
Projects
None yet
Development

Successfully merging this pull request may close these issues.