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.

Sign up for GitHub

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

Jump to bottom

Merge gridinv + some other skipped stuff #702

Closed
wants to merge 1,477 commits into from
Closed

Merge gridinv + some other skipped stuff #702

wants to merge 1,477 commits into from

Conversation

DebugOk
Copy link
Contributor

@DebugOk DebugOk commented Jan 20, 2024

How to piss off an entire community in 1 simple step.

Cant automerge anyways so I'll have to figure out a way to do this and not fuck up the repo horribly

deltanedas and others added 30 commits January 21, 2024 00:05
@deltanedas @DebugOk
add carp suit to autodrobe (DeltaV-Station#407)
a1fb8b6 
Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit 0d83a6d)
@DebugOk
Automatic Changelog Update (DeltaV-Station#407)
94e9497 
(cherry picked from commit 677f68e)
@IamVelcroboy @DebugOk
CRITICAL Hotfix (DeltaV-Station#422)
885adfe 
Co-authored-by: Jeff <>
(cherry picked from commit 55d00bf)
@DebugOk
Update theater.yml (DeltaV-Station#424)
743f96c 
Signed-off-by: Debug <[email protected]>
(cherry picked from commit 771f5b6)
@IamVelcroboy @DebugOk
Arena Hotfix 2 (DeltaV-Station#425)
13421fd 
Co-authored-by: Jeff <>
(cherry picked from commit cc0575a)
@FluffiestFloof @DebugOk
Fix Mass Sleep being Telegnosis (DeltaV-Station#418)
c0a9af4 
* fix

* add icons for actions with target

(cherry picked from commit de7f97b)
@VMSolidus @DebugOk
Trimming the bird emotes (DeltaV-Station#419)
50a8a2c 
* Trimming the bird emotes

* Guh

(cherry picked from commit 07382cd)
@DebugOk
Automatic Changelog Update (DeltaV-Station#419)
db14341 
(cherry picked from commit 833a853)
@Carolyn3114 @DebugOk
fixes warden + sec hardsuits (DeltaV-Station#420)
81f9462 
(cherry picked from commit d994e29)
@CodedCrow @DebugOk
Shiva as ghost role (DeltaV-Station#416)
87164e8 
* Update pets.yml

* Added proper description in locale folder

* Double checking my grammer

Boy is it going to be weird if this needs to be fixed later and only gets reverted

* using their instead of his/her/their

* Update pets.yml

added comment

Signed-off-by: Colin-Tel <[email protected]>

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>

(cherry picked from commit 9c6ddd7)
@FluffiestFloof @DebugOk
readds that (DeltaV-Station#415)
90d9233 
(cherry picked from commit 2edfb06)
@leonardo-dabepis @DebugOk
Reskin Glimmer Machines (Prober and Drain) (DeltaV-Station#421)
40c7e39 
* glimmer machines reskin

* Update glimmer_prober.yml

add comments

Signed-off-by: Colin-Tel <[email protected]>

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
(cherry picked from commit 5ef7a9e)
@DebugOk
Automatic Changelog Update (DeltaV-Station#421)
abfa859 
(cherry picked from commit 645818c)
@Colin-Tel @DebugOk
Update asterisk.yml (DeltaV-Station#427)
8417aff 
* Update asterisk.yml

Fixed unpowered maint hatch
Added YouTool and mini-jetpack to engineering

* Update asterisk.yml

Gave Salvage a pair of insuls

* Update asterisk.yml

gave security a secway, water bottles, and the corpsman gets a microwave and donk pockets

(cherry picked from commit 6563eba)
@Colin-Tel @DebugOk
Fix custom round end sounds (DeltaV-Station#429)
53278fb 
* Update announcements.yml

* Update announcements.yml

oops I missed a couple

* Update announcements.yml

:trollface:

(cherry picked from commit 2e01818)
@DebugOk
Automatic Changelog Update (DeltaV-Station#429)
528150f 
(cherry picked from commit 6b15012)
@VMSolidus @DebugOk
Laika is Smart Doggo (DeltaV-Station#430)
9d7fa41 
(cherry picked from commit dd4cb7f)
@DebugOk
Automatic Changelog Update (DeltaV-Station#430)
f0b9a26 
(cherry picked from commit 4e032a3)
@IamVelcroboy @DebugOk
Map Edits (DeltaV-Station#432)
4305e3c 
* Map Edits

* Fixgridatmos

---------

Co-authored-by: Jeff <>
(cherry picked from commit 29233c7)
@FluffiestFloof @DebugOk
Removes Security Gear from Salvage Corpses (DeltaV-Station#431)
a4de59d 
* Removes corpsmangear from corpses

* Prevent sec corpses

(cherry picked from commit c90b38b)
@Samsterious @DebugOk
Expand valid character names (DeltaV-Station#426)
ccf5fc8 
(cherry picked from commit 3a803a6)
@DebugOk
Automatic Changelog Update (DeltaV-Station#426)
4339be9 
(cherry picked from commit db9fe5b)
@Colin-Tel @DebugOk
Set max head revs to 1 (DeltaV-Station#413)
7d1ff53 
* Update RevolutionaryRuleComponent.cs

* Revert cs change & change prototype

passed tests locally

(cherry picked from commit c60178f)
@DebugOk
Automatic Changelog Update (DeltaV-Station#413)
e8fc52e 
(cherry picked from commit 7626f30)
@Colin-Tel @DebugOk
Added Head ID cards to lockers (DeltaV-Station#434)
93cb037 
Because sometimes you have the locker, but not the guy who owns it.

(cherry picked from commit 86994b5)
@DebugOk
Automatic Changelog Update (DeltaV-Station#434)
6f2cc98 
(cherry picked from commit 648cb3e)
@IamVelcroboy @DebugOk
Hive five (DeltaV-Station#435)
a259161 
* The Hive Rebase

* Remove un-merged maps from files

---------

Co-authored-by: Jeff <>
(cherry picked from commit ef89695)
@DebugOk
Automatic Changelog Update (DeltaV-Station#435)
cedac54 
(cherry picked from commit d126ed2)
@IamVelcroboy @DebugOk
Map Edits (DeltaV-Station#436)
b5c6677 
Co-authored-by: Jeff <>
(cherry picked from commit 0815352)
@FluffiestFloof @DebugOk
Prober and Drainer crafting + Prober sounds (DeltaV-Station#398)
acf3a21 
* Prober Drainer graph and sounds

* normality crystal

I knew I was missing something

* Normality = 5 ectoplasm, drainer = 1 crystal

* Fix oopsy

* Psionic and Golemancy guidebooks

* I swear yml sometimes

* Change recipe to fit guidebook

* Update epistemics.yml

* add comment

---------

Signed-off-by: Colin-Tel <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
(cherry picked from commit efe3d0d)
Adrian16199 and others added 11 commits January 21, 2024 00:32
@Adrian16199 @DebugOk
Fixes mantis not spawnin with their respective bag. (DeltaV-Station#643)
dd4e526 
* Fixes mantis not spawnin with their respective bag.

A small thing but somethin to note nontheless.

* Fixes it as I didnt notice that there was already yml for the other ones, eeh

* Update backpack.yml

(cherry picked from commit fa044a0)
@DebugOk
Automatic Changelog Update (DeltaV-Station#643)
805671b 
(cherry picked from commit c791a6a)
@Adrian16199 @DebugOk
Laika change. (DeltaV-Station#678)
d6f6bb6 
(cherry picked from commit 022ca05)
@DebugOk
Automatic Changelog Update (DeltaV-Station#678)
4a2b9b9 
(cherry picked from commit f2ad4eb)
@DebugOk
Remove remaining spare ID card (DeltaV-Station#696)
d8d889c 
Update heads.yml

I forgor

Signed-off-by: Debug <[email protected]>
(cherry picked from commit f06d4ac)
@lleftTheDragon @DebugOk
Salvage cloak (DeltaV-Station#631)
81a0d68 
* CLAOK TO BRRR

* Correct cloak placement

* more corrections

* removed unwanted code

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Crates/salvage.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Lockers/cargo.yml

Co-authored-by: Colin-Tel <[email protected]>
Signed-off-by: lleftTheDragon <[email protected]>

---------

Signed-off-by: lleftTheDragon <[email protected]>
Co-authored-by: Colin-Tel <[email protected]>
(cherry picked from commit 16e0774)
@DebugOk
Automatic Changelog Update (DeltaV-Station#631)
a004798 
(cherry picked from commit ae8f3fa)
@DebugOk
Fix SpareIdCabinet prototypes (DeltaV-Station#697)
398bd6a 
(cherry picked from commit 7af5703)
@DebugOk
Gamemode votes (DeltaV-Station#698)
30576d1 
* Allow voting for the extended and survival gamemode

These votes shouldn't be called ever anyways, so might aswell use them for the adminless server

* Update periapsis.toml

(cherry picked from commit 0eef1fe)
@DebugOk
Automatic Changelog Update (DeltaV-Station#698)
4d8a0cf 
(cherry picked from commit 396973d)
@IamVelcroboy @DebugOk
Map Hotfix: Hammurabi (DeltaV-Station#699)
34e960c 
* Map Hotfix: Hammurabi

* fix corpsman's airlock

---------

Co-authored-by: Velcroboy <>
(cherry picked from commit 5727e27)
@github-actions GitHub Actions
Copy link
Contributor

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 20, 2024 •
edited
Loading

RSI Diff Bot; head commit 27bfc79 merging into 5727e27
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 27bfc79

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI labels Jan 20, 2024
@DebugOk
Copy link
Contributor Author

DebugOk commented Jan 20, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

I would've never guessed, thanks

@deltanedas
Copy link
Member

honestly in its more finished state its not too bad, besides changing every fucking item back :trollface:

@DEATHB4DEFEAT
Copy link
Member

:shipit:

image

@VMSolidus
Copy link
Contributor

image

internal screaming
external screaming

@DebugOk
Copy link
Contributor Author

DebugOk commented Jan 21, 2024

Replaced by #703

@DebugOk DebugOk closed this Jan 21, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy Awaiting requested review from IamVelcroboy IamVelcroboy is a code owner

@DEATHB4DEFEAT DEATHB4DEFEAT Awaiting requested review from DEATHB4DEFEAT

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: UI Status: Merge Conflict Fix your PR! Status: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.