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

Upstream 03.08.2024 #41

Merged
merged 174 commits into from
Aug 3, 2024
Merged

Upstream 03.08.2024 #41

merged 174 commits into from
Aug 3, 2024

Conversation

doublechest0
Copy link
Contributor

О PR

Почему / Баланс

Технические детали

Медиа

  • Я добавил к этому PR скриншоты/видео, демонстрирующие его изменения в игре, или этот PR не требует демонстрации в игре

Changelog

Errant-4 and others added 30 commits July 27, 2024 07:58
Silence MindAddRoles in AntagSelectionSystem
* Some new plants mutations

* glasstle inhand

* gapple trico increase ↑

1-10 to 3-16

* replace trico with doc delight
* bleh

* Bugs spread disease :(

* they are reproducing

* no lore
Makes thief objective for stealing figures and stamps easier
* Move vgroid much closer

General feedback is map spam + it takes too long to get to. This is somewhat "close" (considering 1/4 of the distance is the vgroid itself) but without a jetpack / shuttle it's going to be an endeavour.

* Decrease max

* Tweaks

* godzilla

* Update Content.Server/Shuttles/Components/GridSpawnComponent.cs
* Update SharedDoorSystem.cs

* comment

* empty space

---------

Co-authored-by: plykiya <[email protected]>
dont forget to set the airtights when the tights are aired
* tweak(geras): Add a confirmation popup for gera transformation

* remove abstract parent
…ner (#29927)

* Update stomach removal and lung removal smite

* New function makes things simple

---------

Co-authored-by: plykiya <[email protected]>
* Update Marathon

* Update 2

* Update 3

* Update 5

* Update 5 (actually this time)
* OH DEAR LORD I WASTED 2 HOURS ON THIS STUPID SHIT!!!

* change some logic
fix punctuation in anchored / unachored  examine text
Mervill and others added 22 commits August 3, 2024 01:49
* debug command to make you thirsty

* pr feedback
* add haloperidol, potassium iodide

* review fixes

* review and tuning

* shader review

* use timespan and AutoPausedField
Keep players that have had messages in the round at the top
* Rearrange Engineering Wires

* Replaces chemistry windoors with correct access
Corrects spelling mistakes and changes dosages to doses
* Recolor winter boots

* fix inhands

* better colors

* FOOT
* reorganize coats, greyscale coats and hoods

* fix inhands

* make rsi validator happy

* even mo' hap'

* comma schmomma

* oops theres a recipe

* armor credits

* painflicts
* Ngl added fr this time

* Update speech-chatsan.ftl

Not gonna lie sounds more realistic than not going to lie
* Adding the admin prefix to the ahelp

* Updating the admin prefix

* The second update of the admin prefix

* Configuration correction
* Moves spread data to new component

* Refactors shotgun spread code

* Makes shotgun cartridges and projectiles use new component

* Attempts to fix nullable build error

* Fixes hitscan weapons that I broke :(

* Saviour commit?

---------

Co-authored-by: EmoGarbage404 <[email protected]>
* commit 1

* 2

* add more text

* apply review

* apply review 2

Co-authored-by: slarticodefast <[email protected]>

---------

Co-authored-by: slarticodefast <[email protected]>
* made the dank pizza actually dank

* made the dank pizza also contain some nutritional value
…354)

* IN MY WALLS! IN MY WALLS THEY ARE IN MY WALLS HELP HEELP HEKP PA DADOEAMD EODM AOM D *DIES* IM NOT DEAD ADADADDADIAMSDIM

* RUN I SAID RUN! THEY TOOK MY UKELELE

Co-authored-by: EmoGarbage404 <[email protected]>

* Many have fallen

* It's all emo's fault

---------

Co-authored-by: EmoGarbage404 <[email protected]>
@doublechest0 doublechest0 self-assigned this Aug 3, 2024
@doublechest0 doublechest0 changed the title Upstream 03.09.024 Upstream 03.08.024 Aug 3, 2024
@doublechest0 doublechest0 changed the title Upstream 03.08.024 Upstream 03.08.2024 Aug 3, 2024
@doublechest0 doublechest0 merged commit 1a13a1e into master Aug 3, 2024
5 of 11 checks passed
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.