Skip to content

Ship Guns Port#2

Merged
ark1368 merged 3 commits into
mainfrom
ship-it
Mar 11, 2025
Merged

Ship Guns Port#2
ark1368 merged 3 commits into
mainfrom
ship-it

Conversation

@ark1368
Copy link
Copy Markdown
Contributor

@ark1368 ark1368 commented Mar 11, 2025

About the PR

Why / Balance

How to test

Media

Requirements

Breaking changes

Changelog

ark1368 added 2 commits March 10, 2025 22:14
* Gunnery Control

* YAML This Rabbit

(cherry picked from commit eacaeecd36aee1e7a03323929b16a7662ffb9717)
Signed-off-by: ark1368 <189933909+ark1368@users.noreply.github.com>
Signed-off-by: ark1368 <189933909+ark1368@users.noreply.github.com>
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Mar 11, 2025

RSI Diff Bot; head commit 98aacd0 merging into 4aadf1c
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_Mono/Objects/ShuttleWeapons/50cal.rsi

State Old New Status
space_artillery Added

Resources/Textures/_Mono/Objects/ShuttleWeapons/artillery.rsi

State Old New Status
artillery Added

Resources/Textures/_Mono/Objects/ShuttleWeapons/t35.rsi

State Old New Status
space_artillery Added

Resources/Textures/_Mono/Objects/SpaceArtillery/50_armorpiercing_machinegun_casing.rsi

State Old New Status
base-projectile Added
base-spent Added
base Added

Resources/Textures/_Mono/Objects/SpaceArtillery/630_armorpiercing_shell_casing.rsi

State Old New Status
base-projectile Added
base-spent Added
base Added

Resources/Textures/_Mono/Objects/SpaceArtillery/plasmashot.rsi

State Old New Status
plasmashot Added

Edit: diff updated after 98aacd0

Signed-off-by: ark1368 <189933909+ark1368@users.noreply.github.com>
@ark1368 ark1368 merged commit c75695d into main Mar 11, 2025
@ark1368 ark1368 deleted the ship-it branch March 11, 2025 20:35
Ilya246 pushed a commit to Ilya246/Monolith that referenced this pull request Aug 28, 2025
…Station#3298)

* silicon name button in department (temporary commit)

* borg name

* ui & proto

* IT WORKS!!!

* sprites

* fixed??

* setrsi & make not null chassis unchangeable

* other subtypes

* another way to change silicon name

* fix

* ftl

* remove SiliconSpritePreferenceUiKey

* chore: Automatically update REUSE headers

* chore: Automatically update REUSE headers

* maybe works idk lol (goobmod)

* Revert "borg name"

This reverts commit a350a0d7

* Revert "silicon name button in department (temporary commit)"

This reverts commit 251ae93774d4e0ab2432e2e59d33b4aa334ace44.

* Revert "another way to change silicon name"

This reverts commit 31a51e43

* chore: Automatically update REUSE headers

* remove borg name, uncessary code & add Goobstation comments

* chore: Automatically update REUSE headers

* remove uncessary code Monolith-Station#2

* chore: Automatically update REUSE headers

* fix checkfail

* chore: Automatically update REUSE headers

* remove binary radiochannel

* make subtype variable not null

* chore: Automatically update REUSE headers

* chore: Automatically update REUSE headers

* ftl

* remove uncessary components

* chore: Automatically update REUSE headers

* Update Content.Server/Silicons/Borgs/BorgSystem.cs

Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>

* chore: Automatically update REUSE headers

* fix formatting

* sprites

* chore: Automatically update REUSE headers

* yml

* chore: Automatically update REUSE headers

* remove whole shitcode

* PUSH PUSH PUSH INTO WIZDEN CODE

* chore: Automatically update REUSE headers

* chore: Automatically update REUSE headers

* chore: Automatically update REUSE headers

* whitespace fix

* blackspaces in prison

* fix animation

* fix

* fix checkfail

---------

Co-authored-by: BeBright <98597725+be1bright@users.noreply.github.com>
Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: SX-7 <92227810+SX-7@users.noreply.github.com>
Co-authored-by: gluesniffler <159397573+gluesniffler@users.noreply.github.com>
LaCumbiaDelCoronavirus added a commit to LaCumbiaDelCoronavirus/- that referenced this pull request Aug 29, 2025
NazrinNya pushed a commit to NazrinNya/Monolith that referenced this pull request Mar 22, 2026
…on#2)

* Добавлено для ВЛ-игроков открытие всех ролей и деньгу

* Ну и немного пофиксим
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Mar 25, 2026
@Mrrpip Mrrpip mentioned this pull request Mar 26, 2026
3 tasks
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Mar 28, 2026
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Apr 7, 2026
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Apr 11, 2026
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Apr 11, 2026
EldritchPineapple added a commit to EldritchPineapple/Monolith that referenced this pull request Apr 19, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant