Skip to content

Mirror: Landmine stepoff#358

Merged
DangerRevolution merged 2 commits intoSimple-Station:masterfrom
SimpleStation14:space-wizards_space-station-14_22962_2024-05-03
Jun 17, 2024
Merged

Mirror: Landmine stepoff#358
DangerRevolution merged 2 commits intoSimple-Station:masterfrom
SimpleStation14:space-wizards_space-station-14_22962_2024-05-03

Conversation

@SimpleStation14
Copy link
Copy Markdown
Member

@SimpleStation14 SimpleStation14 commented May 3, 2024

Mirror of PR #22962: Landmine stepoff from space-wizards space-wizards/space-station-14

54dd273f660d6d8d523d0771bb8d8437373b082e

PR opened by YuriyKiss at 2023-12-25 12:38:55 UTC

PR changed 13 files with 95 additions and 47 deletions.

The PR had the following labels:

  • Status: Awaiting Changes

Original Body

About the PR

Landmine will explode when player steps off it. Landmine will make a sound effect when player steps on it
Close #21658 (Issue has some other suggestions, turn them into separate issues if relevant)

Requires space-wizards/RobustToolbox#4883

Why / Balance

IRL some landmines will only trigger after you release the pressure put on them.

Technical details

There are two landmine modes now, one will make landmine trigger immediately after player steps on them another one will only trigger after player steps off the landmine (this is the default now).

Media

Landmine stepoff in action:

unknown_2024.02.01-18.04.mp4
  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

  • tweak: landmines will trigger after you step off them
  • add: landmine trigger sound

@SimpleStation14 SimpleStation14 added the Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot label May 3, 2024
@github-actions github-actions Bot added the Status: Merge Conflict FIX YOUR PR AAAGH label May 5, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented May 5, 2024

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

@VMSolidus VMSolidus marked this pull request as ready for review May 5, 2024 19:27
@DangerRevolution DangerRevolution requested a review from a team May 11, 2024 01:37
@github-actions github-actions Bot added the Status: Needs Review Someone please review this label May 11, 2024
@DangerRevolution DangerRevolution added Changes: C# Changes any cs files Priority: 4-Low Should be resolved at some point Size: 3-Medium For medium issues/PRs Status: Needs Cleanup Someone has to clean this before merging Status: Help Wanted Extra attention is needed Type: Feature Creation of or significant changes to a feature labels May 11, 2024
@VMSolidus
Copy link
Copy Markdown
Member

VMSolidus commented May 12, 2024

I need access to this PR so I can fix the merge conflict issues.

@VMSolidus
Merge branch 'master' into space-wizards_space-station-14_22962_2024-…
86ca9db 
…05-03

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
@github-actions github-actions Bot added Changes: Audio Changes any ogg files Changes: YML Changes any yml files and removed Status: Merge Conflict FIX YOUR PR AAAGH labels May 29, 2024
@DangerRevolution DangerRevolution merged commit 2bf744d into Simple-Station:master Jun 17, 2024
VMSolidus added a commit to VMSolidus/Einstein-Engines that referenced this pull request Jun 21, 2024
@SimpleStation14 @VMSolidus
Mirror: Landmine stepoff (Simple-Station#358)
cef74f3 
## Mirror of PR #22962: [Landmine
stepoff](space-wizards/space-station-14#22962)
from <img src="https://avatars.githubusercontent.com/u/10567778?v=4"
alt="space-wizards" width="22"/>
[space-wizards](https://github.com/space-wizards)/[space-station-14](https://github.com/space-wizards/space-station-14)

###### `54dd273f660d6d8d523d0771bb8d8437373b082e`

PR opened by <img
src="https://avatars.githubusercontent.com/u/59531932?v=4"
width="16"/><a href="https://github.com/YuriyKiss"> YuriyKiss</a> at
2023-12-25 12:38:55 UTC

---

PR changed 13 files with 95 additions and 47 deletions.

The PR had the following labels:
- Status: Awaiting Changes


---

<details open="true"><summary><h1>Original Body</h1></summary>

> ## About the PR
> Landmine will explode when player steps off it. Landmine will make a
sound effect when player steps on it
> Close #21658 (Issue has some other suggestions, turn them into
separate issues if relevant)
> 
> Requires space-wizards/RobustToolbox#4883
> 
> ## Why / Balance
> IRL some landmines will only trigger after you release the pressure
put on them.
> 
> ## Technical details
> There are two landmine modes now, one will make landmine trigger
immediately after player steps on them another one will only trigger
after player steps off the landmine (this is the default now).
> 
> ## Media
> Landmine stepoff in action:
> 
>
https://github.com/space-wizards/space-station-14/assets/59531932/6e884619-7217-4301-bd78-6e843e0d78f1
> 
> - [X] I have added screenshots/videos to this PR showcasing its
changes ingame, **or** this PR does not require an ingame showcase
> 
> ## Breaking changes
> 
> 
> **Changelog**
> - tweak: landmines will trigger after you step off them
> - add: landmine trigger sound
> 


</details>

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: SimpleStation14 <Unknown>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Dec 15, 2024
@ShadesMars
Merge pull request Simple-Station#358 from Fansana/logo-update
1a35af5 
Logo Update
Mnemotechnician pushed a commit to Mnemotechnician/Einstein-Engines that referenced this pull request Dec 15, 2024
Automatic Changelog Update (Simple-Station#358)
e33004f
BohdanNovikov0207 added a commit to BohdanNovikov0207/Orehum-Project that referenced this pull request Apr 10, 2026
@BohdanNovikov0207 @DeusMaldPr
@GoobAutomatedBot @NotActuallyMarty @Fritz-Franz1337 @LuciferEOS @StormyDragon @slarticodefast @TheNumberRus @Androidonator @doktor-gonz0 @SezakiAiri @Androclast @StrangerOfParadiseOG @Sarahon @Naxel11 @Aidenkrz @BeanyBoi69 @thebiggestbruh @Syoga23 @H2Owe @Kenkaitos @GNUtopia @whateverusername0 @gusxyz @pheenty @Aviu00 @N0lim @10kee @RedTerrorDark @xPressed @Roudenn @TriviaSolari @jellygato @jorgun @CerberusWolfie @taxisnacks @bbalint105 @Super7522 @seyriix @JrInventor05 @Redrover1760 @hzlayer @RedMush1 @NotSoDana @NoElkaTheGod @madeline-celeste @loltart @github-actions @GoobBot @TytosB @B-Kirill @thinkfast1337-2 @liegend @caoimhan2008 @Fat-Engineer-Gaming @harryhulse12-alt @PursuitInAshes @DrSmugleaf @RedstonewolfX @dootythefrooty @RichardBlonski @CliveOcelot @raincally @Hardbassman @IsNotAcceptable
Upstream (#222)
b5c007b 
* Ats lockbox mapping (#6075)

* drools

* ats atmos

* Automated changelog update (#6075)

* Misc Fixes (#6118)

* Automated changelog update (#6118)

* Fix Construction Dupe (#6125)

* Automated changelog update (#6125)

* kettle slight improvements (#6043)

* Automated changelog update (#6043)

* Fix EE Force Crawl and Force Standup (#6127)

Fix EE Verbs AGAIN

* Automated changelog update (#6127)

* nuke DropHeldItemsBehavior & fix some disarms (#6126)

* Nuke dropHeldItemsBehavior and KILL YOURSELF

* fix this shit

* grr

* forgot about this

* Automated changelog update (#6126)

* Fix Chemical payload Fix Botany nutrition. (cherrypick upstream) and delete some empty files.  (#6058)

* We go again

* ???

* This is probably fine

* Make Modular Grenades with Chemical payload respect their trigger delay (#39905)

* adds `KeysIn` data field to `ChemicalPayloadComponent`

And check when handling chemical payloads that a trigger key exists.

* Update Content.Server/Payload/EntitySystems/PayloadSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* This too

---------

Co-authored-by: Serylis of Five <stormy-git@stormweyr.dk>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automated changelog update (#6058)

* [bounty] remove both clowning modules from normal gameplay (#6057)

vsego horoshego

* Automated changelog update (#6057)

* fix stunbaton not knocking down (#6094)

fix idk

* Automated changelog update (#6094)

* Outercommand drip (#5718)

* drip

* outer commander and outercommander drip

* LOICENSING

* goida

* looicense mod

* Automated changelog update (#5718)

* Vulpkanin mask sprites for Feroxi (#5731)

* the fihening

* thump yo tail

* Automated changelog update (#5731)

* mango (#6122)

pring is so easy its slop

* Automated changelog update (#6122)

* Fashion tax beret and wintercoat (#6165)

* hammer hats

* hammer wintercoats

* tax

---------

Co-authored-by: Airi Sezaki <hina@masquerading.agency>

* Automated changelog update (#6165)

* Solars buff (#6090)

* solars are now useful

* made it reasonable

* Automated changelog update (#6090)

* revert winter coat changes from 6165 nerf their infection res (#6168)

a

* Automated changelog update (#6168)

* (1 LINE PR) Removed zipties from bso locker (#6149)

minus zipties from bso locker

* Automated changelog update (#6149)

* sliver can only be removed once from the SM (#6136)

* Automated changelog update (#6136)

* Remove scram grab teleport (#5017)

regoided

* Automated changelog update (#5017)

* No longer delete contra on scan(NTR) (#6144)

Removed the QueueDel call before spawning the teleportation effect.

* Automated changelog update (#6144)

* Fix for incorrect pronouns (#5999)

* Fix for incorrect pronouns

* bringing the remaining fields to the same standard

* change pr number from crovaxgoob to goob

* Update Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5999)

* Automated changelog update (#6003)

* *BOUNTY* Buff syndicate numbers disk (#6065)

* mango

* ok

* ok

* ok

* IM SO SMART

* fix spelling error + checkfail

* metoer

* gg

* RAHHH

* kill JVNE protoids

* Im going to kill you, Androidonator.

* unnecessary message

* shorten length

* Ok

* Revert "Ok"

This reverts commit 25f9934309021f790a71e7ff5df23a27feb06430.

* Revert "shorten length"

This reverts commit 295bb968c4024fde3739447a9613d60d1d26f77d.

* Revert "unnecessary message"

This reverts commit 503da2d4b5750599c10b4388f3818973be2957ca.

* Revert "Im going to kill you, Androidonator."

This reverts commit 9a5f110a05f8e5d14d547de496528cfbe72a2069.

* Revert "kill JVNE protoids"

This reverts commit 8d8e4fbb40338c10b72f8e828e42a2bf5ba4808e.

* Revert "RAHHH"

This reverts commit ae11a8efbfe049dd63ae80a38e7bee27a912a7cd.

* Revert "gg"

This reverts commit ea1d113739e0afeff2a703bee87fc11b129493bf.

* Revert "Merge branch 'syndie-disk-bounty' of https://github.com/BeanyBoi69/gabagool-webedit-ops into syndie-disk-bounty"

This reverts commit c51f2695719a5e4b8b969a556f343cfdb343056a, reversing
changes made to 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "metoer"

This reverts commit 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "IM SO SMART"

This reverts commit 24cdaaee911d4a818e3c800275052eba97e98c1b.

* Revert "ok"

This reverts commit 75b2e3b50da5fb0eb0eb49ce050cdeb874919fc6.

* Revert "ok"

This reverts commit aed5ae000da50b7c69e152b0808689c8ac2c974d.

* Revert "ok"

This reverts commit e4957050173cdfe60b474a0ed0c75529e411b05a.

* Revert "mango"

This reverts commit 3e19d8074dfeec82934e8b8ff7d11b70458a7e37.

* #THROWANDROIDINTOAPITOFFIRE

* Reapply "shorten length"

This reverts commit 6a4db81210a7473b88d01836687099c55c1ccca6.

* oops

* it's not a webedit i promise

* i cant read

* Hello

* syringe gun fix (#6108)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6108)

* [bounty] adds distress signallers to sectech (#6134)

mangomango

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6134)

* GO BINGLE BOY RUN (Balance pr chuddening)  (#6162)

bingle buff number 2

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6162)

* adjust OnChangelingMapInit to actually use the component configurations (minor) (#5922)

j

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* bedsheets butcherable (#6104)

* bedsheets butcherable

* added recyclable tag

* no upstream changes

* added comma

* Automated changelog update (#6104)

* Beestation music expansion (#6012)

* mango

* commit my fucking attributions bro

* would you rather have 1 fish or 2 fish

* remove whitespace

* war!!!

* past the present view

* unidentified lifesigns in mango

* add to gamerules

* fix test fail?

* Please speed, i need this!

* Correct credits

* Automated changelog update (#6012)

* Allow Carried ents to escape. (#5936)

* CarryFix

* Update Content.Shared/_DV/Carrying/CarryingSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5936)

* Add more reagents to reagent anom (#5981)

* chemmaxx

* fix spelling error/checkfail

* Automated changelog update (#5981)

* always extend cosmic cult final  (#6137)

lazy

* Automated changelog update (#6137)

* Added logging to silicon laws (#6077)

godo

* Furslop (#6166)

* base

* update

* Automated changelog update (#6166)

* Prevent Singuloth Knight dropping their own hammer (#6178)

move and add

* Automated changelog update (#6178)

* Wheelchair Collision Fix (#6113)

make wheelchairs not hit by thrown/bullets/lasers

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6113)

* Fix tests again (#6181)

Fix tests

* Uniform printer link to Material Silo (#6180)

silo and lube

* Automated changelog update (#6180)

* Fix vendchem being sluggish (#6182)

tweak

* Automated changelog update (#6182)

* Add missing category to bunch of surgery tools (#6176)

add missing category

* Automated changelog update (#6176)

* [Fix] Fungal soil can be built with other mushroom now (#6177)

add

* Add Dropper to Lathe (#6179)

dropper

* adding sign language implanter with sci research (#6117)

added implanter for sign language with the advanced translation research node

* Automated changelog update (#6179)

* Automated changelog update (#6117)

* Traitor rebriefing (#5491)

* oh no bro

* oh no bro

* remove mango

* oh my fucking god

* yeah

* challenge role

* not improving things at all

* nukeshit

* fix shitcode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/round-end.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

Co-authored-by: gus <august.eymann@gmail.com>

* blocked

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>

* Automated changelog update (#5491)

* [bounty] Capoeira update (#5929)

* fix grab delay increasing from fast attack speed

* rework capoeira push kick

* reduce duration

* Automated changelog update (#5929)

* Some fixes and tweaks (heretic) (#6089)

* Do.

* Shitmed change.

* Automated changelog update (#6089)

* fixed legendary ling checking forbidden technique (#6141)

* fixed legendary ling checking forbidden technique

* my phone is linging

* changeling blood to xenobio triggers

* Automated changelog update (#6141)

* slime latch fixes (#6174)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6174)

* Revert "Prevent Singuloth Knight dropping their own hammer" (#6187)

Revert "Prevent Singuloth Knight dropping their own hammer (#6178)"

This reverts commit 2e80d19.

* Thunderdome (#6066)

* cuh

* esword kit + give everyone a basic medkit by default

* cache entman

* unmolest rulesystem

* Everywhere I look

* todo

* todo2

* fuck you

* ass

* Shitcode1

* stuff 2

* stuff 3

* stuff 4

* ass2

* my IDE got fucked you get webedits

whatever

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: Marty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6066)

* Jumpsuit toggle and resprites (#6160)

* toggelable tops clothing enable, sec section

* dont even ask... it just works

* meta fix + BSO toggle

* PDA visual code

port from Goob-Station/Goob-Station#5848

* moved modified jumpsuits/skirts to goobmod

* fixed + temp monkey sprites

* fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET

* fileshare push

* update

* pen + RD

* rsi issue fix

* cargo update

* sci inhand error fix

* valid RSI

* filepath naming fix

* joel

* outter command PDA fix

* FUck you
bad
joel
filepath naming fix
valid RSI
cargo update
rsi issue fix
pen + RD
update
fileshare push
fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET
fixed + temp monkey sprites
moved modified jumpsuits/skirts to goobmod
PDA visual code

port from Goob-Station/Goob-Station#5848
meta fix + BSO toggle
dont even ask... it just works
toggelable tops clothing enable, sec section

� Conflicts:
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/Entities/Objects/Devices/pda.yml
�	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
�	Resources/Prototypes/Loadouts/loadout_groups.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
�	Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/blueshield_shirt.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png
�	Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json

* gulp

* guh

* # Goob # Goob # Goob # Goob # Goob # Goob

* I'm YAMLing my Linter

* Move stuff comment others

* Apply suggestions from code review

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/satchel.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/backpacks.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml

* Update Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

* Fix these

* Fix these2

* Last

* 1

* messenger bag update for cargo

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6160)

* Update server settings and changelog details

* Refactor publish changelog workflow

Removed unnecessary steps and updated job name.

* Install Python dependencies for changelog RSS

Added a step to install Python dependencies for the changelog RSS publishing process.

* Change RSS and XSL file paths to relative

Updated RSS and XSL file paths to relative locations.

* Rename build job to changelog_rss in workflow

* Update paths for RSS and XSL files

* Update XSL_FILE path for changelog RSS tool

* error inhand and kimono fix (#6202)

* Automated changelog update (#6202)

* Fix xenovac bug (#6076)

* this john git really pisses me off!!!!

* fixxed

* Automated changelog update (#6076)

* Migrate reagents to new anti stun (old doesn`t work) (#6197)

migrate to new anti stun

* Automated changelog update (#6197)

* what if my STUPID chudtainers didnt fail upstream merges!!! or merge code that crashed servers!!! (#6204)

* fuck my stupid chud maints dude

* what if my STUPID chudtainers didnt fail upstream merges!!!

* fix 2

* Automated changelog update (#6204)

* Small justice sword resprite (#6142)

* reskin

* nah

* fix

* noBuffs??

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6142)

* Disabled Hristov in thunderdome (#6205)

dissabled hirstov in thunderdome

* Automated changelog update (#6205)

* Add crew's languages to AI and borgs (#5951)

* Add crew's languages to AI and borgs

* Tradebands -> Tradeband

* thunder dome improvements (#6210)

* thundering dome

* 2nd commit of shame bcz i pushed ts

* chud

* Add more ore storages for Lavaland (#5803)

* Add more ore storages and ashwood stuff

* AAAAAAAAAAAAA fix

* add the magnet back

* commit cherrypick

* Assorted thundadome fixes (#6212)

* fland update (#5962)

* capoeira to thunderdome (#6217)

* real

* switch the pens

* typo

* default configs (#6229)

* default configs

* better

* fix configs (#6231)

fix

* Added localization text for the Shitmed DNA scramble event. (#6228)

* Freedom implant and biodegrade unchuddify/fix/tweak (#6071)

* Freedom.

* Forgot

* recharger speed buff (#6132)

i have adhd

* Chocolate Milk Recipe (#6227)

Add chocolate milk recipe, categorized chocolate milk as a nonalcoholic drink for the guidebook.

* [Port] Stamps can now use images (#6175)

* works

* Stamp icon

* expand

* upgrade shader

---------

Co-authored-by: Fishbait <Fishbait@git.ml>

* Remove Santa and Dark Lord events (#6220)

remove slop

* mind crawler mono + quieter (#6199)

* [bounty] makes heavy shotgun and its ammo cheaper (#5669)

free gc

Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>

* Added guard to wounding that checks target's valid damage types (#5995)

* Added guard to wounding that checks target's valid damage types

* Fix chud semantics

* null reference award

* Make TryComp inline, use return value correctly

* Grab Intent - Moved to Its Own System (#6025)

* fucked up

* Grab Intent Refactor

* last cleanup

* restore rider slop

* fix more rider slop

* woopses

* adjust goob comments to be more accurate

* fixed silly goy code

* OOPS

* one more todo

* oopsies but grabs arent shitty now

* grabintent comps

* partialised and better organization

* no more mispredicts holeee

* Update publish.yml

* chloris arrivals fix + misc mapping (#6235)

* I hate my chud life

* removes some of the trash i mapped

* Remove one lobby art (#6253)

* yah

* i knew i forgot something

* [FIX] Actually gives Vox/IPC the new grab comps (#6248)

* Jetpack users are less affected by momentum steering (#6073)

* make jets feel less sluggish

* Thrust falloff is whatever actually

* How could I forget you

* uncontrollable jetpack inhands

* wobbly

* Oh que j'aimerais danser encore une fois
Mais ces jambes raides ne bougent plus du tout

* Les jours s’écoulent comme un fleuve tranquille

* oh tragedy

* Fix test: Require shaking to get chocolate milk (#6246)

Require shaking to get chocolate milk

* Fix PizzaBomb (#6257)

* Box update (#5837)

* box

* grrr

* gr

* changes

* grrrr

* You'd imagine (#6266)

* You'd imagine

* Rawr

* Baggy (but fancy) CentComm jumpsuit (#6250)

* Baggy (but fancy) CentComm jumpsuit

* Description/name changes

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Add override_adminname_in_client_ahelp setting

* Evil flips (#6237)

* Add Demotion status to Security Criminal Computer (#6273)

Add Demotion status

* lavaland mapping (#6272)

brap

* salv vendor pr (BALANCE/LAVALAND) (#6274)

* salv vendor

* linter

* Fix admin naming (#6292)

* Reverting "armor tax" from Drip clothing (#6295)

* it is Reverted

* 1 mistake yamllinter fears me

* New ClothingHeadHatArmored and
ClothingHeadHatArmoredCC

* last ones

* Abstracting tadc

* Pull 10ke from ahelps (#6299)

* slime rancher nerf (#6271)

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Make slaughter demon understand & speak tauceti (#6261)

* Remade CMO cloak and mantle (#6190)

* Fix Mechs (#6316)

raiderban marty

* Added default sounds to Reptilian (#6315)

Reptilian default sounds

Added sighing, coughing, and yawning sounds to Reptilians.

* Removes ritual of knowledge (#6314)

* Oops its gone.

* Yup

* Food + Chems change based on heat (#6323)

Heat tinting

* Fixed my Goob namespace fuck ups (#6322)

* goob namespace

* Goob namespace from my older PR (deusmalding)

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* delta mapping (#6307)

* delta mapping

* misc mapping

* sniff sniff (#6298)

sniff sniff

* Fix examine texture for surgery (#6193)

fix

fix Examine png for linux and verb to start surgery change from rsi to Texture

* [Fix atmos reisn] (#6224)

Fix and move

* Medibot heal threshold change (#6189)

* Medibot heal threshold change

* Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* 6 lines of lathe yaml for major QOL (#6098)

* modular machine parts

* he forgot

* phone webedit

* Makes slaughter/laughter demons butcherable (#6252)

* awa

* wa

* a

* Apply suggestion from @NotActuallyMarty

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Bulwark nullrod goes in suitslot (#6264)

* bulwark goes in suitslot

bulwark can now be placed in the suitslot and uses back sprites.

* Update meta.json

* Update meta.json

* Increase the lung gas absorption limit by x2 (#6198)

* 2 variables all this time btw (#6301)

* gg

* bnuy

* shaft miners get mining headsets (#6163)

Change One Line

* [Fix] Fixes the constant changes in sprite whenever you are buckled with sprite drag and drop.. (#6287)

Fix Buckling

* combat injector massive qol (#6291)

trust

* Changes flip stamina cost to 33 (#6289)

honk shoo

Updated FlipStaminaCost to reflect new stamina requirements.

* made explosions a bit better (#6290)

* Two line change

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* pirates stuff (#5946)

* pirates stuff

* review

* i'm well regarded

* Товарищ Илья ,здравствуйте,сделайте чтобы с шансом в 65% любая мышь могла быть блобом

* ███████████
█░▄▄▄█░▄▄▄█
█░▄▄░█▄▄▄▒█
█▄▄▄▄▀▄▄▄▄▀

* fixed: hierophant doesn't finish fight (#6186)

* fix

* fix error

* fix ecxeption

* change

* [Bounty] Mice hats (#6133)

* mice now can wear hats

* rsi path change

* ima doopid

* forgor comments

* ushanka forever

* Revert "rsi path change"

This reverts commit 9a327e7384757968bb3b38a35dd17fc0dd31c026.

* moved to goob

* slime behavior fixes (#6203)

* slime behavior fixes

* removed unnecessary popup system import

* removed unnecessary braces

* better armor examine (#6219)

Did you know its really easy to steal prs that should have been upstreamed anyway?

Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Change cult starting spell (#6201)

* Starting cult

* a

* Fix SwapTeleportOnThrowSystem (#5801)

fix parent

* Cull thundadome adminlog spam (#6218)

* Caught up in routine

* oh yeah while I'm here

* AURA OPS (#6020)

* add attribution, file, entity

* spacebar

* Add Kardashev-Mosin to Thunderdome (#6282)

mosin

* Small Furry shark(feroxi) Resprite (#6288)

* resprite

* marks...

* goida

* test1

* test2

* fix1

* fix2

* fix3

* moreMarks

* FurryMask

* fix3

* HarduitHelm

* HARDSUIT!

* fix4.1

* fix4.2

* fix4.3

* fix4.4

* fix4.5

* fix4.6

* give ipc reboot notification (#6260)

* give ipc reboot revive notification

* remove useless brackets

Co-authored-by: LuciferMkshelter  <154002422+LuciferEOS@users.noreply.github.com>

---------

Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>

* Fixes cdnumber apprentices spawn (#6321)

* stuff

* stuff

* stuff

* Loneop nuke music + assorted shitcode (#6276)

* make collection, add file and attributes

* Hi, my name is shitcode

* token

* suicide tomorrow

* oh my fucking god

* fix locale

* hee hee hee ha

* jukebox!!

* Revert "jukebox!!"

This reverts commit d9a81d45440364f5e708c525cfc47cb482aaf3bd.

* jukebox!!!!!

* im smart

* re-adds 2 slots back to syringe case (#6332)

jh

* Update Credits (#6324)

Co-authored-by: GoobBot <uristmchands@proton.me>

* cog update (#5944)

* guess whos back

* ok i dont care, it works? it works.

* cloning

* unmigrate

* service room

* Serpentcrest update (#6026)

* update

* round 2

* uhhhh

* big fuckin uhhh....

* oops

* salvtopia

* invalidfuck

* also this

* request

* oasis maints expansion + qol changes (2) (#6148)

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update .oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Somehow Gate returned [bounty] (#6310)

Update gate.yml

* Biofabs to abductor shuttle and minor changes (#5798)

* update shuttles

* fix map spawn

* perhaps fix test fail

* Fix thermal vision overlay rendering on camera viewports (#6312)

* Fix thermal vision overlay rendering on camera viewports

* Review

* Medical cloning tweak (#6284)

* tweak

* comment

* yaml linter

* review

* i forgot to push

* Update Content.Server/Cloning/CloningPodSystem.cs

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* lockable action bar (#6330)

* unbuckle doafter (#6329)

* unbuckle

* fix tests

* Less agressive color shifting on chems (#6328)

Less agressive colors

* Fix priority queue (#6327)

* Fix priority queue

* Remove old RabbitSlop comments and headers

* Recallable Null Rod (#6183)

* recallable

* rename

* webedit

* vs major

* i love wrong using

* last push hopefully

* review

* Update Content.Goobstation.Common/Religion/BibleUserComponent.cs

* Update Content.Goobstation.Shared/Religion/Nullrod/Systems/BindNullrodSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* minor rework and refactor to augmented eyesight (#5580)

j

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* ai verb to cryo/earlyleave (#6278)

* ai way of 'cryoing'

* add bloat

* this is the way

* there was literally no reason to put it there

* add icon

* shutdown should be lowercase ugh

* better announcement

* make announcement only show for command radio users

* fix file naming

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Shared/Silicon/AiEarlyLeave/SharedStationAiEarlyLeaveSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* custom lawboard import/export (#5763)

* godo

* ctrl+c ctrl+v failure

* oh fuck right (max laws/law size)

* oh my fucking god

* Fuck.

that solves that i guess

(fixed the lawboards sometimes not showing others what laws were in them)

* Update Content.Goobstation.Shared/CustomLawboard/CustomLawboardComponent.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [bounty] more mothroach variety! (#6143)

* all_in

* locale? + fix comments

* Update mothcroach.ftl

* Update animals.yml

* Update Resources/Prototypes/_DV/GameRules/events.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Move heretic to mind (#5811)

* Move heretic to mind.

* Fix.

* Fix2.

* Fix3

* Idc.

* Remove victim heretic comp on sacrifice.

* Remove shitcode.

* Fix.

* forgot to commit

* Forgot about this.

* It builds which means everything works.

* [Fix] Shitcode AnimatedEmotesSystem to check for bullshit and let borgs flip. (#6275)

* this is a sad day.

* TurboShitCode Flipping Anims.

* minor chameleon skin rework and refactor (#5576)

* b

* forgort guide

* how it feels being a bumbling retard

* son

* oh my fgucking god br o

* new chaplain vestments (#6280)

* all_in

* casdca

* new desc

* new system

* new sprite

* remove locale

* Bloodsucking slimes (#6234)

* SlimeDamageOvertimeComponent change

* SlimeLatchSystem HungerUpdate change

* xenobio slime protototype changes

* Slime toxin added

* Chemicals split to children on mitosis

* Veteran sec's New drip (#6306)

* backend done

* inhands and descryptions

* airy

* renamed to veteran and increased time requirement

* yaml :(

* rename

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

---------

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

* new ling ability - regenerate & small rework to stasis (#5569)

* the

* forgor guide

* b

* forgot guide bruh

* merged it

* oh yea

* bruh

* for mat

* extend intellicard to be compatible with other silicons (#6311)

* implement extended intellicard functionality

* i forgor this

* i <3 microcommits

* i literally dont know how or when this was deleted

* fix fov draw being disabled for some godforsaken reason

---------

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* hos' justice can now hear radio (#6146)

yamlmaxxing is so easy it's slop

* Viro chem yaml maxxing (#6172)

BRAAAAAAAAAAAAAAAAAP

* QM cloak and beret resprite (#6305)

* qm cloak and beret

update qm cloak and qm beret

* _Goobstation not GoobStation (fix)

* [Balance] Reduce Changeling Starting EP (#6331)

change starting currency

* carps and dragons can identify sleeping carp users (#6251)

Way of sleeping carp visual for sentient carp and dragons $40
Exactly as the title says, gives a visual indicator of sleeping carp masters to dragons and player space carp to prevent them just attacking them on sight.

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* New AI Core Textures (#6325)

New AI Core Textures! (Simple-Station#1613)


(cherry picked from commit 57477c019be0ecc3e86d127484db7755bbe8ac2d)

Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>

* actually fix priority queue this time? (#6335)

* actually fix priority queue this time?

* cleanup UI and fix another bug

* Fixes new Veteran Jumpsuit Showing not being aquirable (#6334)

im a CHUUD

* Final slasher stuff (#5689)

* stuff

* stuff

* stuff

* stuff

* stuff

* stuff

* review

* testfail

* testfail again

* review x3

---------

Co-authored-by: loltart <lo1tartyt@gmail.com>

* EORG Round end Popup (#6277)

* popup

* a

* mrp only?

* event

* to init

* didnt test but it should be fine?

* smaller

* namespace

* Dont get the mind this way folks. Ling stasis reload fix (#6345)

What the fuck

* April Fools (#6344)

* Blinking

* breathing

* evil system

* Fix being unable to choose energy weapon radial UI (#6346)

fix

* Revert Fun (#6351)

* Add missing loc to reverse bear trap (#6360)

loc

* [Port] RMC toggling dead chat. (#6357)

Deadchat (Simple-Station#554)

* removes guerilla gloves from uplink

* oops

* Add Disable Deadchat Command called `setdchat` (#7240)



* REmoves irrelevant CVAR

* Using

* fix?

---------

Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>

* [Port] Medichem Goggles and Glasses from downstream. (#6359)

Bounty - Medichem Goggles and Glasses (Simple-Station#349)

* Copy edits from Goobstation

Copying 3 commits I made in my goob fork

* Implement and fix crafting recipes

Recipes weren't working but I managed to get them to work

* Fix recipe wording

i may be stupid

* Give CMO medichem glasses

The Chief Medical Officer gets Medichem Glasses equipped instead of Medical Glasses when they spawn.

Using a Chameleon Controller Implant gives you Medichem Glasses instead of a Medical HUD.

* Trying to fix recipe

Why can't it just work man

* Give Visiting CMO Medichem

* Update Namespaces

my bad



* Fix Namespaces Again

Who would have thought that the stuff I put in Omu would need to be in the Omu namespace

* Minor spelling mistake

* man

* Removed Emtpy space

---------

Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* small star gazer resprite (#6349)

* cool

* fix

* [Port] Xenomorph Downstream Changes. (#6353)

* Disable xeno gibing (Simple-Station#368)

Make it no longer gib

* Xeno tweaks (Simple-Station#358)

* stuff

* fix it

* Remove useless comment since we are upstream

* rmc resin breaking sounds (Simple-Station#441)

sounds

Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

---------

Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* Fix Shaft Miner unable to buy pressure kit (#6362)

fix

* Fixes smartlink arms and wizard mindswap (#6367)

stuff

* Rouge bribed me (Arse Nath) (#6363)

* bro

* unneeded

* requested

* shock chem cull (#6350)

* initial

* update fun.yml

* 15%.yml

* octo unnerf

* small Heretic Icons Resprite (#6368)

cool

* Toolbelt QOL (#6373)

* Eta tuff

* ooops

* hmmmm

* okay fuck you

* why are you this way

* Okay!

* ANOTHER queue update cuz i was bored (#6338)

* process all avalable slots instead of one at a time

* git reset too hard, i love nuking all my commits on accident.

* fix gun surgery (#6390)

genius!

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* Shaft miners to meta (#6380)

real

* Unen fat (#220)

* Add force parameter to Down method in SharedBuckleSystem

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* refactor

* LOX

* Update token remarks in Russian localization

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Bibi them for space

* Detective buff

* lint fix

* boom

* mo lint err

* no no

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Added translation

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: DeusMaldPr <214400248+DeusMaldPr@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <administrator@goobstation.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: Fritz Franz <fritzfranz1711@gmail.com>
Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>
Co-authored-by: Serylis of Five <stormy-git@stormweyr.dk>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: thenumber <85048853+TheNumberRus@users.noreply.github.com>
Co-authored-by: Androidonator <33227516+Androidonator@users.noreply.github.com>
Co-authored-by: gonz0 <105350621+doktor-gonz0@users.noreply.github.com>
Co-authored-by: Airi Sezaki <airi@masquerading.agency>
Co-authored-by: Airi Sezaki <hina@masquerading.agency>
Co-authored-by: StrangerOfParadiseOG <atnion93@gmail.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: Naxel <46362288+Naxel11@users.noreply.github.com>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>
Co-authored-by: BeanyBoi69 <92493635+BeanyBoi69@users.noreply.github.com>
Co-authored-by: the biggest bruh <199992874+thebiggestbruh@users.noreply.github.com>
Co-authored-by: _Syoga23_ <57214969+Syoga23@users.noreply.github.com>
Co-authored-by: Jvne <39907509+H2Owe@users.noreply.github.com>
Co-authored-by: Kenkaitos <240330945+Kenkaitos@users.noreply.github.com>
Co-authored-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>
Co-authored-by: whateverusername0 <113782077+whateverusername0@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>
Co-authored-by: Ted Lukin <fedorlukin2006@gmail.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: N0lim <68152971+N0lim@users.noreply.github.com>
Co-authored-by: 10KE <151458027+10kee@users.noreply.github.com>
Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: RedTerror <37833085+RedTerrorDark@users.noreply.github.com>
Co-authored-by: Maxim Zvyagincev <max.zvyagincev@gmail.com>
Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com>
Co-authored-by: TriviaSolari <154280615+TriviaSolari@users.noreply.github.com>
Co-authored-by: jellygato <aly.jellygato@gmail.com>
Co-authored-by: fishbait <gnesse@gmail.com>
Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Co-authored-by: taxisnacks <75760063+taxisnacks@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <247751749+GoobAutomatedBot@users.noreply.github.com>
Co-authored-by: Valniae <74309145+bbalint105@users.noreply.github.com>
Co-authored-by: Johnly <Jonhlybr@gmail.com>
Co-authored-by: sey <134509717+seyriix@users.noreply.github.com>
Co-authored-by: JrInventor05Next <205915704+JrInventor05Next@users.noreply.github.com>
Co-authored-by: Redrover1760 <39284090+Redrover1760@users.noreply.github.com>
Co-authored-by: hzlayer <57817247+hzlayer@users.noreply.github.com>
Co-authored-by: RedMush1 <88719613+RedMush1@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: madeline-celeste <224184098+madeline-celeste@users.noreply.github.com>
Co-authored-by: loltart <159829224+loltart@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: thinkfast <118076104+thinkfast1337-2@users.noreply.github.com>
Co-authored-by: liegend <2008.morozov.ri@gmail.com>
Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>
Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>
Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: loltart <lo1tartyt@gmail.com>
Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>
Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Kris <horacethetoweringthug@gmail.com>
Co-authored-by: Serj <184727191+IsNotAcceptable@users.noreply.github.com>
BohdanNovikov0207 added a commit to BohdanNovikov0207/Orehum-Project that referenced this pull request Apr 13, 2026
@BohdanNovikov0207 @GoobAutomatedBot
@LuciferEOS @NotActuallyMarty @StormyDragon @slarticodefast @TheNumberRus @Androidonator @doktor-gonz0 @DeusMaldPr @SezakiAiri @Androclast @StrangerOfParadiseOG @Sarahon @Naxel11 @Aidenkrz @BeanyBoi69 @thebiggestbruh @Syoga23 @H2Owe @Kenkaitos @GNUtopia @whateverusername0 @gusxyz @pheenty @Aviu00 @N0lim @10kee @RedTerrorDark @xPressed @Roudenn @TriviaSolari @jellygato @jorgun @CerberusWolfie @taxisnacks @bbalint105 @Super7522 @seyriix @JrInventor05 @Redrover1760 @hzlayer @RedMush1 @NotSoDana @NoElkaTheGod @madeline-celeste @loltart @github-actions @GoobBot @TytosB @Fritz-Franz1337 @B-Kirill @thinkfast1337-2 @liegend @caoimhan2008 @Fat-Engineer-Gaming @harryhulse12-alt @PursuitInAshes @DrSmugleaf @RedstonewolfX @dootythefrooty @RichardBlonski @CliveOcelot @raincally @Hardbassman @IsNotAcceptable
Little Upstream (#226)
356c8c2 
* Automated changelog update (#6127)

* nuke DropHeldItemsBehavior & fix some disarms (#6126)

* Nuke dropHeldItemsBehavior and KILL YOURSELF

* fix this shit

* grr

* forgot about this

* Automated changelog update (#6126)

* Fix Chemical payload Fix Botany nutrition. (cherrypick upstream) and delete some empty files.  (#6058)

* We go again

* ???

* This is probably fine

* Make Modular Grenades with Chemical payload respect their trigger delay (#39905)

* adds `KeysIn` data field to `ChemicalPayloadComponent`

And check when handling chemical payloads that a trigger key exists.

* Update Content.Server/Payload/EntitySystems/PayloadSystem.cs

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* This too

---------

Co-authored-by: Serylis of Five <stormy-git@stormweyr.dk>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Automated changelog update (#6058)

* [bounty] remove both clowning modules from normal gameplay (#6057)

vsego horoshego

* Automated changelog update (#6057)

* fix stunbaton not knocking down (#6094)

fix idk

* Automated changelog update (#6094)

* Outercommand drip (#5718)

* drip

* outer commander and outercommander drip

* LOICENSING

* goida

* looicense mod

* Automated changelog update (#5718)

* Vulpkanin mask sprites for Feroxi (#5731)

* the fihening

* thump yo tail

* Automated changelog update (#5731)

* mango (#6122)

pring is so easy its slop

* Automated changelog update (#6122)

* Fashion tax beret and wintercoat (#6165)

* hammer hats

* hammer wintercoats

* tax

---------

Co-authored-by: Airi Sezaki <hina@masquerading.agency>

* Automated changelog update (#6165)

* Solars buff (#6090)

* solars are now useful

* made it reasonable

* Automated changelog update (#6090)

* revert winter coat changes from 6165 nerf their infection res (#6168)

a

* Automated changelog update (#6168)

* (1 LINE PR) Removed zipties from bso locker (#6149)

minus zipties from bso locker

* Automated changelog update (#6149)

* sliver can only be removed once from the SM (#6136)

* Automated changelog update (#6136)

* Remove scram grab teleport (#5017)

regoided

* Automated changelog update (#5017)

* No longer delete contra on scan(NTR) (#6144)

Removed the QueueDel call before spawning the teleportation effect.

* Automated changelog update (#6144)

* Fix for incorrect pronouns (#5999)

* Fix for incorrect pronouns

* bringing the remaining fields to the same standard

* change pr number from crovaxgoob to goob

* Update Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5999)

* Automated changelog update (#6003)

* *BOUNTY* Buff syndicate numbers disk (#6065)

* mango

* ok

* ok

* ok

* IM SO SMART

* fix spelling error + checkfail

* metoer

* gg

* RAHHH

* kill JVNE protoids

* Im going to kill you, Androidonator.

* unnecessary message

* shorten length

* Ok

* Revert "Ok"

This reverts commit 25f9934309021f790a71e7ff5df23a27feb06430.

* Revert "shorten length"

This reverts commit 295bb968c4024fde3739447a9613d60d1d26f77d.

* Revert "unnecessary message"

This reverts commit 503da2d4b5750599c10b4388f3818973be2957ca.

* Revert "Im going to kill you, Androidonator."

This reverts commit 9a5f110a05f8e5d14d547de496528cfbe72a2069.

* Revert "kill JVNE protoids"

This reverts commit 8d8e4fbb40338c10b72f8e828e42a2bf5ba4808e.

* Revert "RAHHH"

This reverts commit ae11a8efbfe049dd63ae80a38e7bee27a912a7cd.

* Revert "gg"

This reverts commit ea1d113739e0afeff2a703bee87fc11b129493bf.

* Revert "Merge branch 'syndie-disk-bounty' of https://github.com/BeanyBoi69/gabagool-webedit-ops into syndie-disk-bounty"

This reverts commit c51f2695719a5e4b8b969a556f343cfdb343056a, reversing
changes made to 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "metoer"

This reverts commit 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "IM SO SMART"

This reverts commit 24cdaaee911d4a818e3c800275052eba97e98c1b.

* Revert "ok"

This reverts commit 75b2e3b50da5fb0eb0eb49ce050cdeb874919fc6.

* Revert "ok"

This reverts commit aed5ae000da50b7c69e152b0808689c8ac2c974d.

* Revert "ok"

This reverts commit e4957050173cdfe60b474a0ed0c75529e411b05a.

* Revert "mango"

This reverts commit 3e19d8074dfeec82934e8b8ff7d11b70458a7e37.

* #THROWANDROIDINTOAPITOFFIRE

* Reapply "shorten length"

This reverts commit 6a4db81210a7473b88d01836687099c55c1ccca6.

* oops

* it's not a webedit i promise

* i cant read

* Hello

* syringe gun fix (#6108)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6108)

* [bounty] adds distress signallers to sectech (#6134)

mangomango

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6134)

* GO BINGLE BOY RUN (Balance pr chuddening)  (#6162)

bingle buff number 2

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6162)

* adjust OnChangelingMapInit to actually use the component configurations (minor) (#5922)

j

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* bedsheets butcherable (#6104)

* bedsheets butcherable

* added recyclable tag

* no upstream changes

* added comma

* Automated changelog update (#6104)

* Beestation music expansion (#6012)

* mango

* commit my fucking attributions bro

* would you rather have 1 fish or 2 fish

* remove whitespace

* war!!!

* past the present view

* unidentified lifesigns in mango

* add to gamerules

* fix test fail?

* Please speed, i need this!

* Correct credits

* Automated changelog update (#6012)

* Allow Carried ents to escape. (#5936)

* CarryFix

* Update Content.Shared/_DV/Carrying/CarryingSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5936)

* Add more reagents to reagent anom (#5981)

* chemmaxx

* fix spelling error/checkfail

* Automated changelog update (#5981)

* always extend cosmic cult final  (#6137)

lazy

* Automated changelog update (#6137)

* Added logging to silicon laws (#6077)

godo

* Furslop (#6166)

* base

* update

* Automated changelog update (#6166)

* Prevent Singuloth Knight dropping their own hammer (#6178)

move and add

* Automated changelog update (#6178)

* Wheelchair Collision Fix (#6113)

make wheelchairs not hit by thrown/bullets/lasers

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6113)

* Fix tests again (#6181)

Fix tests

* Uniform printer link to Material Silo (#6180)

silo and lube

* Automated changelog update (#6180)

* Fix vendchem being sluggish (#6182)

tweak

* Automated changelog update (#6182)

* Add missing category to bunch of surgery tools (#6176)

add missing category

* Automated changelog update (#6176)

* [Fix] Fungal soil can be built with other mushroom now (#6177)

add

* Add Dropper to Lathe (#6179)

dropper

* adding sign language implanter with sci research (#6117)

added implanter for sign language with the advanced translation research node

* Automated changelog update (#6179)

* Automated changelog update (#6117)

* Traitor rebriefing (#5491)

* oh no bro

* oh no bro

* remove mango

* oh my fucking god

* yeah

* challenge role

* not improving things at all

* nukeshit

* fix shitcode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/round-end.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

Co-authored-by: gus <august.eymann@gmail.com>

* blocked

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>

* Automated changelog update (#5491)

* [bounty] Capoeira update (#5929)

* fix grab delay increasing from fast attack speed

* rework capoeira push kick

* reduce duration

* Automated changelog update (#5929)

* Some fixes and tweaks (heretic) (#6089)

* Do.

* Shitmed change.

* Automated changelog update (#6089)

* fixed legendary ling checking forbidden technique (#6141)

* fixed legendary ling checking forbidden technique

* my phone is linging

* changeling blood to xenobio triggers

* Automated changelog update (#6141)

* slime latch fixes (#6174)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6174)

* Revert "Prevent Singuloth Knight dropping their own hammer" (#6187)

Revert "Prevent Singuloth Knight dropping their own hammer (#6178)"

This reverts commit 2e80d19.

* Thunderdome (#6066)

* cuh

* esword kit + give everyone a basic medkit by default

* cache entman

* unmolest rulesystem

* Everywhere I look

* todo

* todo2

* fuck you

* ass

* Shitcode1

* stuff 2

* stuff 3

* stuff 4

* ass2

* my IDE got fucked you get webedits

whatever

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: Marty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6066)

* Jumpsuit toggle and resprites (#6160)

* toggelable tops clothing enable, sec section

* dont even ask... it just works

* meta fix + BSO toggle

* PDA visual code

port from Goob-Station/Goob-Station#5848

* moved modified jumpsuits/skirts to goobmod

* fixed + temp monkey sprites

* fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET

* fileshare push

* update

* pen + RD

* rsi issue fix

* cargo update

* sci inhand error fix

* valid RSI

* filepath naming fix

* joel

* outter command PDA fix

* FUck you
bad
joel
filepath naming fix
valid RSI
cargo update
rsi issue fix
pen + RD
update
fileshare push
fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET
fixed + temp monkey sprites
moved modified jumpsuits/skirts to goobmod
PDA visual code

port from Goob-Station/Goob-Station#5848
meta fix + BSO toggle
dont even ask... it just works
toggelable tops clothing enable, sec section

� Conflicts:
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/Entities/Objects/Devices/pda.yml
�	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
�	Resources/Prototypes/Loadouts/loadout_groups.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
�	Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/blueshield_shirt.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png
�	Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json

* gulp

* guh

* # Goob # Goob # Goob # Goob # Goob # Goob

* I'm YAMLing my Linter

* Move stuff comment others

* Apply suggestions from code review

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/satchel.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/backpacks.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml

* Update Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

* Fix these

* Fix these2

* Last

* 1

* messenger bag update for cargo

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6160)

* Update server settings and changelog details

* Refactor publish changelog workflow

Removed unnecessary steps and updated job name.

* Install Python dependencies for changelog RSS

Added a step to install Python dependencies for the changelog RSS publishing process.

* Change RSS and XSL file paths to relative

Updated RSS and XSL file paths to relative locations.

* Rename build job to changelog_rss in workflow

* Update paths for RSS and XSL files

* Update XSL_FILE path for changelog RSS tool

* error inhand and kimono fix (#6202)

* Automated changelog update (#6202)

* Fix xenovac bug (#6076)

* this john git really pisses me off!!!!

* fixxed

* Automated changelog update (#6076)

* Migrate reagents to new anti stun (old doesn`t work) (#6197)

migrate to new anti stun

* Automated changelog update (#6197)

* what if my STUPID chudtainers didnt fail upstream merges!!! or merge code that crashed servers!!! (#6204)

* fuck my stupid chud maints dude

* what if my STUPID chudtainers didnt fail upstream merges!!!

* fix 2

* Automated changelog update (#6204)

* Small justice sword resprite (#6142)

* reskin

* nah

* fix

* noBuffs??

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6142)

* Disabled Hristov in thunderdome (#6205)

dissabled hirstov in thunderdome

* Automated changelog update (#6205)

* Add crew's languages to AI and borgs (#5951)

* Add crew's languages to AI and borgs

* Tradebands -> Tradeband

* thunder dome improvements (#6210)

* thundering dome

* 2nd commit of shame bcz i pushed ts

* chud

* Add more ore storages for Lavaland (#5803)

* Add more ore storages and ashwood stuff

* AAAAAAAAAAAAA fix

* add the magnet back

* commit cherrypick

* Assorted thundadome fixes (#6212)

* fland update (#5962)

* capoeira to thunderdome (#6217)

* real

* switch the pens

* typo

* default configs (#6229)

* default configs

* better

* fix configs (#6231)

fix

* Added localization text for the Shitmed DNA scramble event. (#6228)

* Freedom implant and biodegrade unchuddify/fix/tweak (#6071)

* Freedom.

* Forgot

* recharger speed buff (#6132)

i have adhd

* Chocolate Milk Recipe (#6227)

Add chocolate milk recipe, categorized chocolate milk as a nonalcoholic drink for the guidebook.

* [Port] Stamps can now use images (#6175)

* works

* Stamp icon

* expand

* upgrade shader

---------

Co-authored-by: Fishbait <Fishbait@git.ml>

* Remove Santa and Dark Lord events (#6220)

remove slop

* mind crawler mono + quieter (#6199)

* [bounty] makes heavy shotgun and its ammo cheaper (#5669)

free gc

Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>

* Added guard to wounding that checks target's valid damage types (#5995)

* Added guard to wounding that checks target's valid damage types

* Fix chud semantics

* null reference award

* Make TryComp inline, use return value correctly

* Grab Intent - Moved to Its Own System (#6025)

* fucked up

* Grab Intent Refactor

* last cleanup

* restore rider slop

* fix more rider slop

* woopses

* adjust goob comments to be more accurate

* fixed silly goy code

* OOPS

* one more todo

* oopsies but grabs arent shitty now

* grabintent comps

* partialised and better organization

* no more mispredicts holeee

* Update publish.yml

* chloris arrivals fix + misc mapping (#6235)

* I hate my chud life

* removes some of the trash i mapped

* Remove one lobby art (#6253)

* yah

* i knew i forgot something

* [FIX] Actually gives Vox/IPC the new grab comps (#6248)

* Jetpack users are less affected by momentum steering (#6073)

* make jets feel less sluggish

* Thrust falloff is whatever actually

* How could I forget you

* uncontrollable jetpack inhands

* wobbly

* Oh que j'aimerais danser encore une fois
Mais ces jambes raides ne bougent plus du tout

* Les jours s’écoulent comme un fleuve tranquille

* oh tragedy

* Fix test: Require shaking to get chocolate milk (#6246)

Require shaking to get chocolate milk

* Fix PizzaBomb (#6257)

* Box update (#5837)

* box

* grrr

* gr

* changes

* grrrr

* You'd imagine (#6266)

* You'd imagine

* Rawr

* Baggy (but fancy) CentComm jumpsuit (#6250)

* Baggy (but fancy) CentComm jumpsuit

* Description/name changes

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Add override_adminname_in_client_ahelp setting

* Evil flips (#6237)

* Add Demotion status to Security Criminal Computer (#6273)

Add Demotion status

* lavaland mapping (#6272)

brap

* salv vendor pr (BALANCE/LAVALAND) (#6274)

* salv vendor

* linter

* Fix admin naming (#6292)

* Reverting "armor tax" from Drip clothing (#6295)

* it is Reverted

* 1 mistake yamllinter fears me

* New ClothingHeadHatArmored and
ClothingHeadHatArmoredCC

* last ones

* Abstracting tadc

* Pull 10ke from ahelps (#6299)

* slime rancher nerf (#6271)

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Make slaughter demon understand & speak tauceti (#6261)

* Remade CMO cloak and mantle (#6190)

* Fix Mechs (#6316)

raiderban marty

* Added default sounds to Reptilian (#6315)

Reptilian default sounds

Added sighing, coughing, and yawning sounds to Reptilians.

* Removes ritual of knowledge (#6314)

* Oops its gone.

* Yup

* Food + Chems change based on heat (#6323)

Heat tinting

* Fixed my Goob namespace fuck ups (#6322)

* goob namespace

* Goob namespace from my older PR (deusmalding)

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* delta mapping (#6307)

* delta mapping

* misc mapping

* sniff sniff (#6298)

sniff sniff

* Fix examine texture for surgery (#6193)

fix

fix Examine png for linux and verb to start surgery change from rsi to Texture

* [Fix atmos reisn] (#6224)

Fix and move

* Medibot heal threshold change (#6189)

* Medibot heal threshold change

* Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* 6 lines of lathe yaml for major QOL (#6098)

* modular machine parts

* he forgot

* phone webedit

* Makes slaughter/laughter demons butcherable (#6252)

* awa

* wa

* a

* Apply suggestion from @NotActuallyMarty

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Bulwark nullrod goes in suitslot (#6264)

* bulwark goes in suitslot

bulwark can now be placed in the suitslot and uses back sprites.

* Update meta.json

* Update meta.json

* Increase the lung gas absorption limit by x2 (#6198)

* 2 variables all this time btw (#6301)

* gg

* bnuy

* shaft miners get mining headsets (#6163)

Change One Line

* [Fix] Fixes the constant changes in sprite whenever you are buckled with sprite drag and drop.. (#6287)

Fix Buckling

* combat injector massive qol (#6291)

trust

* Changes flip stamina cost to 33 (#6289)

honk shoo

Updated FlipStaminaCost to reflect new stamina requirements.

* made explosions a bit better (#6290)

* Two line change

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* pirates stuff (#5946)

* pirates stuff

* review

* i'm well regarded

* Товарищ Илья ,здравствуйте,сделайте чтобы с шансом в 65% любая мышь могла быть блобом

* ███████████
█░▄▄▄█░▄▄▄█
█░▄▄░█▄▄▄▒█
█▄▄▄▄▀▄▄▄▄▀

* fixed: hierophant doesn't finish fight (#6186)

* fix

* fix error

* fix ecxeption

* change

* [Bounty] Mice hats (#6133)

* mice now can wear hats

* rsi path change

* ima doopid

* forgor comments

* ushanka forever

* Revert "rsi path change"

This reverts commit 9a327e7384757968bb3b38a35dd17fc0dd31c026.

* moved to goob

* slime behavior fixes (#6203)

* slime behavior fixes

* removed unnecessary popup system import

* removed unnecessary braces

* better armor examine (#6219)

Did you know its really easy to steal prs that should have been upstreamed anyway?

Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Change cult starting spell (#6201)

* Starting cult

* a

* Fix SwapTeleportOnThrowSystem (#5801)

fix parent

* Cull thundadome adminlog spam (#6218)

* Caught up in routine

* oh yeah while I'm here

* AURA OPS (#6020)

* add attribution, file, entity

* spacebar

* Add Kardashev-Mosin to Thunderdome (#6282)

mosin

* Small Furry shark(feroxi) Resprite (#6288)

* resprite

* marks...

* goida

* test1

* test2

* fix1

* fix2

* fix3

* moreMarks

* FurryMask

* fix3

* HarduitHelm

* HARDSUIT!

* fix4.1

* fix4.2

* fix4.3

* fix4.4

* fix4.5

* fix4.6

* give ipc reboot notification (#6260)

* give ipc reboot revive notification

* remove useless brackets

Co-authored-by: LuciferMkshelter  <154002422+LuciferEOS@users.noreply.github.com>

---------

Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>

* Fixes cdnumber apprentices spawn (#6321)

* stuff

* stuff

* stuff

* Loneop nuke music + assorted shitcode (#6276)

* make collection, add file and attributes

* Hi, my name is shitcode

* token

* suicide tomorrow

* oh my fucking god

* fix locale

* hee hee hee ha

* jukebox!!

* Revert "jukebox!!"

This reverts commit d9a81d45440364f5e708c525cfc47cb482aaf3bd.

* jukebox!!!!!

* im smart

* re-adds 2 slots back to syringe case (#6332)

jh

* Update Credits (#6324)

Co-authored-by: GoobBot <uristmchands@proton.me>

* cog update (#5944)

* guess whos back

* ok i dont care, it works? it works.

* cloning

* unmigrate

* service room

* Serpentcrest update (#6026)

* update

* round 2

* uhhhh

* big fuckin uhhh....

* oops

* salvtopia

* invalidfuck

* also this

* request

* oasis maints expansion + qol changes (2) (#6148)

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update .oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Somehow Gate returned [bounty] (#6310)

Update gate.yml

* Biofabs to abductor shuttle and minor changes (#5798)

* update shuttles

* fix map spawn

* perhaps fix test fail

* Fix thermal vision overlay rendering on camera viewports (#6312)

* Fix thermal vision overlay rendering on camera viewports

* Review

* Medical cloning tweak (#6284)

* tweak

* comment

* yaml linter

* review

* i forgot to push

* Update Content.Server/Cloning/CloningPodSystem.cs

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* lockable action bar (#6330)

* unbuckle doafter (#6329)

* unbuckle

* fix tests

* Less agressive color shifting on chems (#6328)

Less agressive colors

* Fix priority queue (#6327)

* Fix priority queue

* Remove old RabbitSlop comments and headers

* Recallable Null Rod (#6183)

* recallable

* rename

* webedit

* vs major

* i love wrong using

* last push hopefully

* review

* Update Content.Goobstation.Common/Religion/BibleUserComponent.cs

* Update Content.Goobstation.Shared/Religion/Nullrod/Systems/BindNullrodSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* minor rework and refactor to augmented eyesight (#5580)

j

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* ai verb to cryo/earlyleave (#6278)

* ai way of 'cryoing'

* add bloat

* this is the way

* there was literally no reason to put it there

* add icon

* shutdown should be lowercase ugh

* better announcement

* make announcement only show for command radio users

* fix file naming

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Shared/Silicon/AiEarlyLeave/SharedStationAiEarlyLeaveSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* custom lawboard import/export (#5763)

* godo

* ctrl+c ctrl+v failure

* oh fuck right (max laws/law size)

* oh my fucking god

* Fuck.

that solves that i guess

(fixed the lawboards sometimes not showing others what laws were in them)

* Update Content.Goobstation.Shared/CustomLawboard/CustomLawboardComponent.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [bounty] more mothroach variety! (#6143)

* all_in

* locale? + fix comments

* Update mothcroach.ftl

* Update animals.yml

* Update Resources/Prototypes/_DV/GameRules/events.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Move heretic to mind (#5811)

* Move heretic to mind.

* Fix.

* Fix2.

* Fix3

* Idc.

* Remove victim heretic comp on sacrifice.

* Remove shitcode.

* Fix.

* forgot to commit

* Forgot about this.

* It builds which means everything works.

* [Fix] Shitcode AnimatedEmotesSystem to check for bullshit and let borgs flip. (#6275)

* this is a sad day.

* TurboShitCode Flipping Anims.

* minor chameleon skin rework and refactor (#5576)

* b

* forgort guide

* how it feels being a bumbling retard

* son

* oh my fgucking god br o

* new chaplain vestments (#6280)

* all_in

* casdca

* new desc

* new system

* new sprite

* remove locale

* Bloodsucking slimes (#6234)

* SlimeDamageOvertimeComponent change

* SlimeLatchSystem HungerUpdate change

* xenobio slime protototype changes

* Slime toxin added

* Chemicals split to children on mitosis

* Veteran sec's New drip (#6306)

* backend done

* inhands and descryptions

* airy

* renamed to veteran and increased time requirement

* yaml :(

* rename

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

---------

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

* new ling ability - regenerate & small rework to stasis (#5569)

* the

* forgor guide

* b

* forgot guide bruh

* merged it

* oh yea

* bruh

* for mat

* extend intellicard to be compatible with other silicons (#6311)

* implement extended intellicard functionality

* i forgor this

* i <3 microcommits

* i literally dont know how or when this was deleted

* fix fov draw being disabled for some godforsaken reason

---------

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* hos' justice can now hear radio (#6146)

yamlmaxxing is so easy it's slop

* Viro chem yaml maxxing (#6172)

BRAAAAAAAAAAAAAAAAAP

* QM cloak and beret resprite (#6305)

* qm cloak and beret

update qm cloak and qm beret

* _Goobstation not GoobStation (fix)

* [Balance] Reduce Changeling Starting EP (#6331)

change starting currency

* carps and dragons can identify sleeping carp users (#6251)

Way of sleeping carp visual for sentient carp and dragons $40
Exactly as the title says, gives a visual indicator of sleeping carp masters to dragons and player space carp to prevent them just attacking them on sight.

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* New AI Core Textures (#6325)

New AI Core Textures! (Simple-Station#1613)


(cherry picked from commit 57477c019be0ecc3e86d127484db7755bbe8ac2d)

Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>

* actually fix priority queue this time? (#6335)

* actually fix priority queue this time?

* cleanup UI and fix another bug

* Fixes new Veteran Jumpsuit Showing not being aquirable (#6334)

im a CHUUD

* Final slasher stuff (#5689)

* stuff

* stuff

* stuff

* stuff

* stuff

* stuff

* review

* testfail

* testfail again

* review x3

---------

Co-authored-by: loltart <lo1tartyt@gmail.com>

* EORG Round end Popup (#6277)

* popup

* a

* mrp only?

* event

* to init

* didnt test but it should be fine?

* smaller

* namespace

* Dont get the mind this way folks. Ling stasis reload fix (#6345)

What the fuck

* April Fools (#6344)

* Blinking

* breathing

* evil system

* Fix being unable to choose energy weapon radial UI (#6346)

fix

* Revert Fun (#6351)

* Add missing loc to reverse bear trap (#6360)

loc

* [Port] RMC toggling dead chat. (#6357)

Deadchat (Simple-Station#554)

* removes guerilla gloves from uplink

* oops

* Add Disable Deadchat Command called `setdchat` (#7240)



* REmoves irrelevant CVAR

* Using

* fix?

---------

Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>

* [Port] Medichem Goggles and Glasses from downstream. (#6359)

Bounty - Medichem Goggles and Glasses (Simple-Station#349)

* Copy edits from Goobstation

Copying 3 commits I made in my goob fork

* Implement and fix crafting recipes

Recipes weren't working but I managed to get them to work

* Fix recipe wording

i may be stupid

* Give CMO medichem glasses

The Chief Medical Officer gets Medichem Glasses equipped instead of Medical Glasses when they spawn.

Using a Chameleon Controller Implant gives you Medichem Glasses instead of a Medical HUD.

* Trying to fix recipe

Why can't it just work man

* Give Visiting CMO Medichem

* Update Namespaces

my bad



* Fix Namespaces Again

Who would have thought that the stuff I put in Omu would need to be in the Omu namespace

* Minor spelling mistake

* man

* Removed Emtpy space

---------

Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* small star gazer resprite (#6349)

* cool

* fix

* [Port] Xenomorph Downstream Changes. (#6353)

* Disable xeno gibing (Simple-Station#368)

Make it no longer gib

* Xeno tweaks (Simple-Station#358)

* stuff

* fix it

* Remove useless comment since we are upstream

* rmc resin breaking sounds (Simple-Station#441)

sounds

Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

---------

Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* Fix Shaft Miner unable to buy pressure kit (#6362)

fix

* Fixes smartlink arms and wizard mindswap (#6367)

stuff

* Rouge bribed me (Arse Nath) (#6363)

* bro

* unneeded

* requested

* shock chem cull (#6350)

* initial

* update fun.yml

* 15%.yml

* octo unnerf

* small Heretic Icons Resprite (#6368)

cool

* Toolbelt QOL (#6373)

* Eta tuff

* ooops

* hmmmm

* okay fuck you

* why are you this way

* Okay!

* ANOTHER queue update cuz i was bored (#6338)

* process all avalable slots instead of one at a time

* git reset too hard, i love nuking all my commits on accident.

* fix gun surgery (#6390)

genius!

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* Shaft miners to meta (#6380)

real

* Unen fat (#220)

* Add force parameter to Down method in SharedBuckleSystem

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* refactor

* LOX

* Update token remarks in Russian localization

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Bibi them for space

* Detective buff

* lint fix

* boom

* mo lint err

* no no

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Added translation

* readd gate to map rotation (#6389)

* i think this is correct

* what the fuck

---------

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* Kill mouse plague (#6428)

6% chance

* Update Credits (#6429)

Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Sponsor got overwritten, return it

* And another return

* Tf

* Removed unused sprites

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <administrator@goobstation.com>
Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: Serylis of Five <stormy-git@stormweyr.dk>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: thenumber <85048853+TheNumberRus@users.noreply.github.com>
Co-authored-by: Androidonator <33227516+Androidonator@users.noreply.github.com>
Co-authored-by: gonz0 <105350621+doktor-gonz0@users.noreply.github.com>
Co-authored-by: DeusMaldPr <214400248+DeusMaldPr@users.noreply.github.com>
Co-authored-by: Airi Sezaki <airi@masquerading.agency>
Co-authored-by: Airi Sezaki <hina@masquerading.agency>
Co-authored-by: StrangerOfParadiseOG <atnion93@gmail.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: Naxel <46362288+Naxel11@users.noreply.github.com>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>
Co-authored-by: BeanyBoi69 <92493635+BeanyBoi69@users.noreply.github.com>
Co-authored-by: the biggest bruh <199992874+thebiggestbruh@users.noreply.github.com>
Co-authored-by: _Syoga23_ <57214969+Syoga23@users.noreply.github.com>
Co-authored-by: Jvne <39907509+H2Owe@users.noreply.github.com>
Co-authored-by: Kenkaitos <240330945+Kenkaitos@users.noreply.github.com>
Co-authored-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>
Co-authored-by: whateverusername0 <113782077+whateverusername0@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>
Co-authored-by: Ted Lukin <fedorlukin2006@gmail.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: N0lim <68152971+N0lim@users.noreply.github.com>
Co-authored-by: 10KE <151458027+10kee@users.noreply.github.com>
Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: RedTerror <37833085+RedTerrorDark@users.noreply.github.com>
Co-authored-by: Maxim Zvyagincev <max.zvyagincev@gmail.com>
Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com>
Co-authored-by: TriviaSolari <154280615+TriviaSolari@users.noreply.github.com>
Co-authored-by: jellygato <aly.jellygato@gmail.com>
Co-authored-by: fishbait <gnesse@gmail.com>
Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Co-authored-by: taxisnacks <75760063+taxisnacks@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <247751749+GoobAutomatedBot@users.noreply.github.com>
Co-authored-by: Valniae <74309145+bbalint105@users.noreply.github.com>
Co-authored-by: Johnly <Jonhlybr@gmail.com>
Co-authored-by: sey <134509717+seyriix@users.noreply.github.com>
Co-authored-by: JrInventor05Next <205915704+JrInventor05Next@users.noreply.github.com>
Co-authored-by: Redrover1760 <39284090+Redrover1760@users.noreply.github.com>
Co-authored-by: hzlayer <57817247+hzlayer@users.noreply.github.com>
Co-authored-by: RedMush1 <88719613+RedMush1@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: madeline-celeste <224184098+madeline-celeste@users.noreply.github.com>
Co-authored-by: loltart <159829224+loltart@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: Fritz Franz <fritzfranz1711@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: thinkfast <118076104+thinkfast1337-2@users.noreply.github.com>
Co-authored-by: liegend <2008.morozov.ri@gmail.com>
Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>
Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>
Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: loltart <lo1tartyt@gmail.com>
Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>
Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Kris <horacethetoweringthug@gmail.com>
Co-authored-by: Serj <184727191+IsNotAcceptable@users.noreply.github.com>
BohdanNovikov0207 added a commit to BohdanNovikov0207/Orehum-Project that referenced this pull request Apr 16, 2026
@BohdanNovikov0207 @GoobAutomatedBot
@doktor-gonz0 @DeusMaldPr @SezakiAiri @Androclast @StrangerOfParadiseOG @Androidonator @Sarahon @Naxel11 @Aidenkrz @BeanyBoi69 @TheNumberRus @thebiggestbruh @Syoga23 @NotActuallyMarty @LuciferEOS @H2Owe @Kenkaitos @GNUtopia @whateverusername0 @gusxyz @pheenty @Aviu00 @N0lim @10kee @RedTerrorDark @xPressed @Roudenn @TriviaSolari @jellygato @jorgun @CerberusWolfie @taxisnacks @bbalint105 @Super7522 @seyriix @JrInventor05 @Redrover1760 @hzlayer @RedMush1 @NotSoDana @NoElkaTheGod @madeline-celeste @loltart @github-actions @GoobBot @TytosB @Fritz-Franz1337 @B-Kirill @thinkfast1337-2 @liegend @caoimhan2008 @Fat-Engineer-Gaming @harryhulse12-alt @PursuitInAshes @DrSmugleaf @RedstonewolfX @dootythefrooty @RichardBlonski @CliveOcelot @raincally @Hardbassman @IsNotAcceptable
Little upstream (#230)
b961ccb 
* Automated changelog update (#5718)

* Vulpkanin mask sprites for Feroxi (#5731)

* the fihening

* thump yo tail

* Automated changelog update (#5731)

* mango (#6122)

pring is so easy its slop

* Automated changelog update (#6122)

* Fashion tax beret and wintercoat (#6165)

* hammer hats

* hammer wintercoats

* tax

---------

Co-authored-by: Airi Sezaki <hina@masquerading.agency>

* Automated changelog update (#6165)

* Solars buff (#6090)

* solars are now useful

* made it reasonable

* Automated changelog update (#6090)

* revert winter coat changes from 6165 nerf their infection res (#6168)

a

* Automated changelog update (#6168)

* (1 LINE PR) Removed zipties from bso locker (#6149)

minus zipties from bso locker

* Automated changelog update (#6149)

* sliver can only be removed once from the SM (#6136)

* Automated changelog update (#6136)

* Remove scram grab teleport (#5017)

regoided

* Automated changelog update (#5017)

* No longer delete contra on scan(NTR) (#6144)

Removed the QueueDel call before spawning the teleportation effect.

* Automated changelog update (#6144)

* Fix for incorrect pronouns (#5999)

* Fix for incorrect pronouns

* bringing the remaining fields to the same standard

* change pr number from crovaxgoob to goob

* Update Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5999)

* Automated changelog update (#6003)

* *BOUNTY* Buff syndicate numbers disk (#6065)

* mango

* ok

* ok

* ok

* IM SO SMART

* fix spelling error + checkfail

* metoer

* gg

* RAHHH

* kill JVNE protoids

* Im going to kill you, Androidonator.

* unnecessary message

* shorten length

* Ok

* Revert "Ok"

This reverts commit 25f9934309021f790a71e7ff5df23a27feb06430.

* Revert "shorten length"

This reverts commit 295bb968c4024fde3739447a9613d60d1d26f77d.

* Revert "unnecessary message"

This reverts commit 503da2d4b5750599c10b4388f3818973be2957ca.

* Revert "Im going to kill you, Androidonator."

This reverts commit 9a5f110a05f8e5d14d547de496528cfbe72a2069.

* Revert "kill JVNE protoids"

This reverts commit 8d8e4fbb40338c10b72f8e828e42a2bf5ba4808e.

* Revert "RAHHH"

This reverts commit ae11a8efbfe049dd63ae80a38e7bee27a912a7cd.

* Revert "gg"

This reverts commit ea1d113739e0afeff2a703bee87fc11b129493bf.

* Revert "Merge branch 'syndie-disk-bounty' of https://github.com/BeanyBoi69/gabagool-webedit-ops into syndie-disk-bounty"

This reverts commit c51f2695719a5e4b8b969a556f343cfdb343056a, reversing
changes made to 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "metoer"

This reverts commit 58ce01bb0c5b784a998e677a73bba06c4966c8ea.

* Revert "IM SO SMART"

This reverts commit 24cdaaee911d4a818e3c800275052eba97e98c1b.

* Revert "ok"

This reverts commit 75b2e3b50da5fb0eb0eb49ce050cdeb874919fc6.

* Revert "ok"

This reverts commit aed5ae000da50b7c69e152b0808689c8ac2c974d.

* Revert "ok"

This reverts commit e4957050173cdfe60b474a0ed0c75529e411b05a.

* Revert "mango"

This reverts commit 3e19d8074dfeec82934e8b8ff7d11b70458a7e37.

* #THROWANDROIDINTOAPITOFFIRE

* Reapply "shorten length"

This reverts commit 6a4db81210a7473b88d01836687099c55c1ccca6.

* oops

* it's not a webedit i promise

* i cant read

* Hello

* syringe gun fix (#6108)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6108)

* [bounty] adds distress signallers to sectech (#6134)

mangomango

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6134)

* GO BINGLE BOY RUN (Balance pr chuddening)  (#6162)

bingle buff number 2

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6162)

* adjust OnChangelingMapInit to actually use the component configurations (minor) (#5922)

j

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* bedsheets butcherable (#6104)

* bedsheets butcherable

* added recyclable tag

* no upstream changes

* added comma

* Automated changelog update (#6104)

* Beestation music expansion (#6012)

* mango

* commit my fucking attributions bro

* would you rather have 1 fish or 2 fish

* remove whitespace

* war!!!

* past the present view

* unidentified lifesigns in mango

* add to gamerules

* fix test fail?

* Please speed, i need this!

* Correct credits

* Automated changelog update (#6012)

* Allow Carried ents to escape. (#5936)

* CarryFix

* Update Content.Shared/_DV/Carrying/CarryingSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#5936)

* Add more reagents to reagent anom (#5981)

* chemmaxx

* fix spelling error/checkfail

* Automated changelog update (#5981)

* always extend cosmic cult final  (#6137)

lazy

* Automated changelog update (#6137)

* Added logging to silicon laws (#6077)

godo

* Furslop (#6166)

* base

* update

* Automated changelog update (#6166)

* Prevent Singuloth Knight dropping their own hammer (#6178)

move and add

* Automated changelog update (#6178)

* Wheelchair Collision Fix (#6113)

make wheelchairs not hit by thrown/bullets/lasers

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6113)

* Fix tests again (#6181)

Fix tests

* Uniform printer link to Material Silo (#6180)

silo and lube

* Automated changelog update (#6180)

* Fix vendchem being sluggish (#6182)

tweak

* Automated changelog update (#6182)

* Add missing category to bunch of surgery tools (#6176)

add missing category

* Automated changelog update (#6176)

* [Fix] Fungal soil can be built with other mushroom now (#6177)

add

* Add Dropper to Lathe (#6179)

dropper

* adding sign language implanter with sci research (#6117)

added implanter for sign language with the advanced translation research node

* Automated changelog update (#6179)

* Automated changelog update (#6117)

* Traitor rebriefing (#5491)

* oh no bro

* oh no bro

* remove mango

* oh my fucking god

* yeah

* challenge role

* not improving things at all

* nukeshit

* fix shitcode

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/objectives/round-end.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Resources/Locale/en-US/game-ticking/game-presets/preset-traitor.ftl

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

Co-authored-by: gus <august.eymann@gmail.com>

* blocked

---------

Co-authored-by: whateverusername0 <whateveremail>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>

* Automated changelog update (#5491)

* [bounty] Capoeira update (#5929)

* fix grab delay increasing from fast attack speed

* rework capoeira push kick

* reduce duration

* Automated changelog update (#5929)

* Some fixes and tweaks (heretic) (#6089)

* Do.

* Shitmed change.

* Automated changelog update (#6089)

* fixed legendary ling checking forbidden technique (#6141)

* fixed legendary ling checking forbidden technique

* my phone is linging

* changeling blood to xenobio triggers

* Automated changelog update (#6141)

* slime latch fixes (#6174)

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Automated changelog update (#6174)

* Revert "Prevent Singuloth Knight dropping their own hammer" (#6187)

Revert "Prevent Singuloth Knight dropping their own hammer (#6178)"

This reverts commit 2e80d19.

* Thunderdome (#6066)

* cuh

* esword kit + give everyone a basic medkit by default

* cache entman

* unmolest rulesystem

* Everywhere I look

* todo

* todo2

* fuck you

* ass

* Shitcode1

* stuff 2

* stuff 3

* stuff 4

* ass2

* my IDE got fucked you get webedits

whatever

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: Marty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6066)

* Jumpsuit toggle and resprites (#6160)

* toggelable tops clothing enable, sec section

* dont even ask... it just works

* meta fix + BSO toggle

* PDA visual code

port from Goob-Station/Goob-Station#5848

* moved modified jumpsuits/skirts to goobmod

* fixed + temp monkey sprites

* fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET

* fileshare push

* update

* pen + RD

* rsi issue fix

* cargo update

* sci inhand error fix

* valid RSI

* filepath naming fix

* joel

* outter command PDA fix

* FUck you
bad
joel
filepath naming fix
valid RSI
cargo update
rsi issue fix
pen + RD
update
fileshare push
fix rsi issue

YES I KNOW THESE ARE NOT IN PALLET
fixed + temp monkey sprites
moved modified jumpsuits/skirts to goobmod
PDA visual code

port from Goob-Station/Goob-Station#5848
meta fix + BSO toggle
dont even ask... it just works
toggelable tops clothing enable, sec section

� Conflicts:
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpsuits.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/Entities/Objects/Devices/pda.yml
�	Resources/Prototypes/Loadouts/Jobs/Science/research_director.yml
�	Resources/Prototypes/Loadouts/loadout_groups.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpskirts.yml
�	Resources/Prototypes/_Goobstation/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Prototypes/_Goobstation/Loadouts/Jobs/Cargo/salvage.yml
�	Resources/Prototypes/_Lavaland/Entities/Clothing/Uniforms/jumpsuits.yml
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpskirt/Security/security_grey.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/Centcom/blueshield_shirt.rsi/meta.json
�	Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/blueshield_officer.rsi/equipped-INNERCLOTHING.png
�	Resources/Textures/_Lavaland/Clothing/Uniforms/Jumpsuit/shaft_miner.rsi/meta.json

* gulp

* guh

* # Goob # Goob # Goob # Goob # Goob # Goob

* I'm YAMLing my Linter

* Move stuff comment others

* Apply suggestions from code review

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/satchel.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml

* Update Resources/Prototypes/Entities/Clothing/Uniforms/color_jumpskirts.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Back/backpacks.yml

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Shoes/boots.yml

* Update Resources/Prototypes/Loadouts/Jobs/Cargo/salvage_specialist.yml

* Fix these

* Fix these2

* Last

* 1

* messenger bag update for cargo

---------

Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6160)

* Update server settings and changelog details

* Refactor publish changelog workflow

Removed unnecessary steps and updated job name.

* Install Python dependencies for changelog RSS

Added a step to install Python dependencies for the changelog RSS publishing process.

* Change RSS and XSL file paths to relative

Updated RSS and XSL file paths to relative locations.

* Rename build job to changelog_rss in workflow

* Update paths for RSS and XSL files

* Update XSL_FILE path for changelog RSS tool

* error inhand and kimono fix (#6202)

* Automated changelog update (#6202)

* Fix xenovac bug (#6076)

* this john git really pisses me off!!!!

* fixxed

* Automated changelog update (#6076)

* Migrate reagents to new anti stun (old doesn`t work) (#6197)

migrate to new anti stun

* Automated changelog update (#6197)

* what if my STUPID chudtainers didnt fail upstream merges!!! or merge code that crashed servers!!! (#6204)

* fuck my stupid chud maints dude

* what if my STUPID chudtainers didnt fail upstream merges!!!

* fix 2

* Automated changelog update (#6204)

* Small justice sword resprite (#6142)

* reskin

* nah

* fix

* noBuffs??

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Automated changelog update (#6142)

* Disabled Hristov in thunderdome (#6205)

dissabled hirstov in thunderdome

* Automated changelog update (#6205)

* Add crew's languages to AI and borgs (#5951)

* Add crew's languages to AI and borgs

* Tradebands -> Tradeband

* thunder dome improvements (#6210)

* thundering dome

* 2nd commit of shame bcz i pushed ts

* chud

* Add more ore storages for Lavaland (#5803)

* Add more ore storages and ashwood stuff

* AAAAAAAAAAAAA fix

* add the magnet back

* commit cherrypick

* Assorted thundadome fixes (#6212)

* fland update (#5962)

* capoeira to thunderdome (#6217)

* real

* switch the pens

* typo

* default configs (#6229)

* default configs

* better

* fix configs (#6231)

fix

* Added localization text for the Shitmed DNA scramble event. (#6228)

* Freedom implant and biodegrade unchuddify/fix/tweak (#6071)

* Freedom.

* Forgot

* recharger speed buff (#6132)

i have adhd

* Chocolate Milk Recipe (#6227)

Add chocolate milk recipe, categorized chocolate milk as a nonalcoholic drink for the guidebook.

* [Port] Stamps can now use images (#6175)

* works

* Stamp icon

* expand

* upgrade shader

---------

Co-authored-by: Fishbait <Fishbait@git.ml>

* Remove Santa and Dark Lord events (#6220)

remove slop

* mind crawler mono + quieter (#6199)

* [bounty] makes heavy shotgun and its ammo cheaper (#5669)

free gc

Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>

* Added guard to wounding that checks target's valid damage types (#5995)

* Added guard to wounding that checks target's valid damage types

* Fix chud semantics

* null reference award

* Make TryComp inline, use return value correctly

* Grab Intent - Moved to Its Own System (#6025)

* fucked up

* Grab Intent Refactor

* last cleanup

* restore rider slop

* fix more rider slop

* woopses

* adjust goob comments to be more accurate

* fixed silly goy code

* OOPS

* one more todo

* oopsies but grabs arent shitty now

* grabintent comps

* partialised and better organization

* no more mispredicts holeee

* Update publish.yml

* chloris arrivals fix + misc mapping (#6235)

* I hate my chud life

* removes some of the trash i mapped

* Remove one lobby art (#6253)

* yah

* i knew i forgot something

* [FIX] Actually gives Vox/IPC the new grab comps (#6248)

* Jetpack users are less affected by momentum steering (#6073)

* make jets feel less sluggish

* Thrust falloff is whatever actually

* How could I forget you

* uncontrollable jetpack inhands

* wobbly

* Oh que j'aimerais danser encore une fois
Mais ces jambes raides ne bougent plus du tout

* Les jours s’écoulent comme un fleuve tranquille

* oh tragedy

* Fix test: Require shaking to get chocolate milk (#6246)

Require shaking to get chocolate milk

* Fix PizzaBomb (#6257)

* Box update (#5837)

* box

* grrr

* gr

* changes

* grrrr

* You'd imagine (#6266)

* You'd imagine

* Rawr

* Baggy (but fancy) CentComm jumpsuit (#6250)

* Baggy (but fancy) CentComm jumpsuit

* Description/name changes

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Add override_adminname_in_client_ahelp setting

* Evil flips (#6237)

* Add Demotion status to Security Criminal Computer (#6273)

Add Demotion status

* lavaland mapping (#6272)

brap

* salv vendor pr (BALANCE/LAVALAND) (#6274)

* salv vendor

* linter

* Fix admin naming (#6292)

* Reverting "armor tax" from Drip clothing (#6295)

* it is Reverted

* 1 mistake yamllinter fears me

* New ClothingHeadHatArmored and
ClothingHeadHatArmoredCC

* last ones

* Abstracting tadc

* Pull 10ke from ahelps (#6299)

* slime rancher nerf (#6271)

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Make slaughter demon understand & speak tauceti (#6261)

* Remade CMO cloak and mantle (#6190)

* Fix Mechs (#6316)

raiderban marty

* Added default sounds to Reptilian (#6315)

Reptilian default sounds

Added sighing, coughing, and yawning sounds to Reptilians.

* Removes ritual of knowledge (#6314)

* Oops its gone.

* Yup

* Food + Chems change based on heat (#6323)

Heat tinting

* Fixed my Goob namespace fuck ups (#6322)

* goob namespace

* Goob namespace from my older PR (deusmalding)

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/Head/hats.yml

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* delta mapping (#6307)

* delta mapping

* misc mapping

* sniff sniff (#6298)

sniff sniff

* Fix examine texture for surgery (#6193)

fix

fix Examine png for linux and verb to start surgery change from rsi to Texture

* [Fix atmos reisn] (#6224)

Fix and move

* Medibot heal threshold change (#6189)

* Medibot heal threshold change

* Update Resources/Prototypes/Entities/Mobs/NPCs/silicon.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* 6 lines of lathe yaml for major QOL (#6098)

* modular machine parts

* he forgot

* phone webedit

* Makes slaughter/laughter demons butcherable (#6252)

* awa

* wa

* a

* Apply suggestion from @NotActuallyMarty

---------

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Bulwark nullrod goes in suitslot (#6264)

* bulwark goes in suitslot

bulwark can now be placed in the suitslot and uses back sprites.

* Update meta.json

* Update meta.json

* Increase the lung gas absorption limit by x2 (#6198)

* 2 variables all this time btw (#6301)

* gg

* bnuy

* shaft miners get mining headsets (#6163)

Change One Line

* [Fix] Fixes the constant changes in sprite whenever you are buckled with sprite drag and drop.. (#6287)

Fix Buckling

* combat injector massive qol (#6291)

trust

* Changes flip stamina cost to 33 (#6289)

honk shoo

Updated FlipStaminaCost to reflect new stamina requirements.

* made explosions a bit better (#6290)

* Two line change

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

* Update Content.Shared/CCVar/CCVars.Playtest.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* pirates stuff (#5946)

* pirates stuff

* review

* i'm well regarded

* Товарищ Илья ,здравствуйте,сделайте чтобы с шансом в 65% любая мышь могла быть блобом

* ███████████
█░▄▄▄█░▄▄▄█
█░▄▄░█▄▄▄▒█
█▄▄▄▄▀▄▄▄▄▀

* fixed: hierophant doesn't finish fight (#6186)

* fix

* fix error

* fix ecxeption

* change

* [Bounty] Mice hats (#6133)

* mice now can wear hats

* rsi path change

* ima doopid

* forgor comments

* ushanka forever

* Revert "rsi path change"

This reverts commit 9a327e7384757968bb3b38a35dd17fc0dd31c026.

* moved to goob

* slime behavior fixes (#6203)

* slime behavior fixes

* removed unnecessary popup system import

* removed unnecessary braces

* better armor examine (#6219)

Did you know its really easy to steal prs that should have been upstreamed anyway?

Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* Change cult starting spell (#6201)

* Starting cult

* a

* Fix SwapTeleportOnThrowSystem (#5801)

fix parent

* Cull thundadome adminlog spam (#6218)

* Caught up in routine

* oh yeah while I'm here

* AURA OPS (#6020)

* add attribution, file, entity

* spacebar

* Add Kardashev-Mosin to Thunderdome (#6282)

mosin

* Small Furry shark(feroxi) Resprite (#6288)

* resprite

* marks...

* goida

* test1

* test2

* fix1

* fix2

* fix3

* moreMarks

* FurryMask

* fix3

* HarduitHelm

* HARDSUIT!

* fix4.1

* fix4.2

* fix4.3

* fix4.4

* fix4.5

* fix4.6

* give ipc reboot notification (#6260)

* give ipc reboot revive notification

* remove useless brackets

Co-authored-by: LuciferMkshelter  <154002422+LuciferEOS@users.noreply.github.com>

---------

Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>

* Fixes cdnumber apprentices spawn (#6321)

* stuff

* stuff

* stuff

* Loneop nuke music + assorted shitcode (#6276)

* make collection, add file and attributes

* Hi, my name is shitcode

* token

* suicide tomorrow

* oh my fucking god

* fix locale

* hee hee hee ha

* jukebox!!

* Revert "jukebox!!"

This reverts commit d9a81d45440364f5e708c525cfc47cb482aaf3bd.

* jukebox!!!!!

* im smart

* re-adds 2 slots back to syringe case (#6332)

jh

* Update Credits (#6324)

Co-authored-by: GoobBot <uristmchands@proton.me>

* cog update (#5944)

* guess whos back

* ok i dont care, it works? it works.

* cloning

* unmigrate

* service room

* Serpentcrest update (#6026)

* update

* round 2

* uhhhh

* big fuckin uhhh....

* oops

* salvtopia

* invalidfuck

* also this

* request

* oasis maints expansion + qol changes (2) (#6148)

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update .oasis.yml

* Update oasis.yml

* Update oasis.yml

* Update oasis.yml

* Somehow Gate returned [bounty] (#6310)

Update gate.yml

* Biofabs to abductor shuttle and minor changes (#5798)

* update shuttles

* fix map spawn

* perhaps fix test fail

* Fix thermal vision overlay rendering on camera viewports (#6312)

* Fix thermal vision overlay rendering on camera viewports

* Review

* Medical cloning tweak (#6284)

* tweak

* comment

* yaml linter

* review

* i forgot to push

* Update Content.Server/Cloning/CloningPodSystem.cs

* Update Content.Goobstation.Common/CCVar/CCVars.Goob.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* lockable action bar (#6330)

* unbuckle doafter (#6329)

* unbuckle

* fix tests

* Less agressive color shifting on chems (#6328)

Less agressive colors

* Fix priority queue (#6327)

* Fix priority queue

* Remove old RabbitSlop comments and headers

* Recallable Null Rod (#6183)

* recallable

* rename

* webedit

* vs major

* i love wrong using

* last push hopefully

* review

* Update Content.Goobstation.Common/Religion/BibleUserComponent.cs

* Update Content.Goobstation.Shared/Religion/Nullrod/Systems/BindNullrodSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* minor rework and refactor to augmented eyesight (#5580)

j

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [Port] Drone update (#6170)

* flashligth change

* drone vision

* overlay dont hide other whit overlay vision

* zombie immune

* changes to movment

* less hp

* drones require charging

* drones now have internal battery

* 300u of oil was to mutch

* clean up

* drones cant use flash

* change hat offset a little

* namespace fix

* reverted  changes to the overlay

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

* Update Content.Server/_Imp/Drone/DroneSystem.cs

---------

Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* ai verb to cryo/earlyleave (#6278)

* ai way of 'cryoing'

* add bloat

* this is the way

* there was literally no reason to put it there

* add icon

* shutdown should be lowercase ugh

* better announcement

* make announcement only show for command radio users

* fix file naming

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Server/Silicon/AiEarlyLeave/StationAiEarlyLeaveSystem.cs

* Update Content.Goobstation.Shared/Silicon/AiEarlyLeave/SharedStationAiEarlyLeaveSystem.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* custom lawboard import/export (#5763)

* godo

* ctrl+c ctrl+v failure

* oh fuck right (max laws/law size)

* oh my fucking god

* Fuck.

that solves that i guess

(fixed the lawboards sometimes not showing others what laws were in them)

* Update Content.Goobstation.Shared/CustomLawboard/CustomLawboardComponent.cs

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* [bounty] more mothroach variety! (#6143)

* all_in

* locale? + fix comments

* Update mothcroach.ftl

* Update animals.yml

* Update Resources/Prototypes/_DV/GameRules/events.yml

---------

Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Move heretic to mind (#5811)

* Move heretic to mind.

* Fix.

* Fix2.

* Fix3

* Idc.

* Remove victim heretic comp on sacrifice.

* Remove shitcode.

* Fix.

* forgot to commit

* Forgot about this.

* It builds which means everything works.

* [Fix] Shitcode AnimatedEmotesSystem to check for bullshit and let borgs flip. (#6275)

* this is a sad day.

* TurboShitCode Flipping Anims.

* minor chameleon skin rework and refactor (#5576)

* b

* forgort guide

* how it feels being a bumbling retard

* son

* oh my fgucking god br o

* new chaplain vestments (#6280)

* all_in

* casdca

* new desc

* new system

* new sprite

* remove locale

* Bloodsucking slimes (#6234)

* SlimeDamageOvertimeComponent change

* SlimeLatchSystem HungerUpdate change

* xenobio slime protototype changes

* Slime toxin added

* Chemicals split to children on mitosis

* Veteran sec's New drip (#6306)

* backend done

* inhands and descryptions

* airy

* renamed to veteran and increased time requirement

* yaml :(

* rename

* Update Resources/Prototypes/_Goobstation/Entities/Clothing/OuterClothing/armour.yml

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

---------

Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>

* new ling ability - regenerate & small rework to stasis (#5569)

* the

* forgor guide

* b

* forgot guide bruh

* merged it

* oh yea

* bruh

* for mat

* extend intellicard to be compatible with other silicons (#6311)

* implement extended intellicard functionality

* i forgor this

* i <3 microcommits

* i literally dont know how or when this was deleted

* fix fov draw being disabled for some godforsaken reason

---------

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* hos' justice can now hear radio (#6146)

yamlmaxxing is so easy it's slop

* Viro chem yaml maxxing (#6172)

BRAAAAAAAAAAAAAAAAAP

* QM cloak and beret resprite (#6305)

* qm cloak and beret

update qm cloak and qm beret

* _Goobstation not GoobStation (fix)

* [Balance] Reduce Changeling Starting EP (#6331)

change starting currency

* carps and dragons can identify sleeping carp users (#6251)

Way of sleeping carp visual for sentient carp and dragons $40
Exactly as the title says, gives a visual indicator of sleeping carp masters to dragons and player space carp to prevent them just attacking them on sight.

Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>

* New AI Core Textures (#6325)

New AI Core Textures! (Simple-Station#1613)


(cherry picked from commit 57477c019be0ecc3e86d127484db7755bbe8ac2d)

Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: No Elka <125199100+NoElkaTheGod@users.noreply.github.com>

* actually fix priority queue this time? (#6335)

* actually fix priority queue this time?

* cleanup UI and fix another bug

* Fixes new Veteran Jumpsuit Showing not being aquirable (#6334)

im a CHUUD

* Final slasher stuff (#5689)

* stuff

* stuff

* stuff

* stuff

* stuff

* stuff

* review

* testfail

* testfail again

* review x3

---------

Co-authored-by: loltart <lo1tartyt@gmail.com>

* EORG Round end Popup (#6277)

* popup

* a

* mrp only?

* event

* to init

* didnt test but it should be fine?

* smaller

* namespace

* Dont get the mind this way folks. Ling stasis reload fix (#6345)

What the fuck

* April Fools (#6344)

* Blinking

* breathing

* evil system

* Fix being unable to choose energy weapon radial UI (#6346)

fix

* Revert Fun (#6351)

* Add missing loc to reverse bear trap (#6360)

loc

* [Port] RMC toggling dead chat. (#6357)

Deadchat (Simple-Station#554)

* removes guerilla gloves from uplink

* oops

* Add Disable Deadchat Command called `setdchat` (#7240)



* REmoves irrelevant CVAR

* Using

* fix?

---------

Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>

* [Port] Medichem Goggles and Glasses from downstream. (#6359)

Bounty - Medichem Goggles and Glasses (Simple-Station#349)

* Copy edits from Goobstation

Copying 3 commits I made in my goob fork

* Implement and fix crafting recipes

Recipes weren't working but I managed to get them to work

* Fix recipe wording

i may be stupid

* Give CMO medichem glasses

The Chief Medical Officer gets Medichem Glasses equipped instead of Medical Glasses when they spawn.

Using a Chameleon Controller Implant gives you Medichem Glasses instead of a Medical HUD.

* Trying to fix recipe

Why can't it just work man

* Give Visiting CMO Medichem

* Update Namespaces

my bad



* Fix Namespaces Again

Who would have thought that the stuff I put in Omu would need to be in the Omu namespace

* Minor spelling mistake

* man

* Removed Emtpy space

---------

Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* small star gazer resprite (#6349)

* cool

* fix

* [Port] Xenomorph Downstream Changes. (#6353)

* Disable xeno gibing (Simple-Station#368)

Make it no longer gib

* Xeno tweaks (Simple-Station#358)

* stuff

* fix it

* Remove useless comment since we are upstream

* rmc resin breaking sounds (Simple-Station#441)

sounds

Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

---------

Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>

* Fix Shaft Miner unable to buy pressure kit (#6362)

fix

* Fixes smartlink arms and wizard mindswap (#6367)

stuff

* Rouge bribed me (Arse Nath) (#6363)

* bro

* unneeded

* requested

* shock chem cull (#6350)

* initial

* update fun.yml

* 15%.yml

* octo unnerf

* small Heretic Icons Resprite (#6368)

cool

* Toolbelt QOL (#6373)

* Eta tuff

* ooops

* hmmmm

* okay fuck you

* why are you this way

* Okay!

* ANOTHER queue update cuz i was bored (#6338)

* process all avalable slots instead of one at a time

* git reset too hard, i love nuking all my commits on accident.

* fix gun surgery (#6390)

genius!

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* Shaft miners to meta (#6380)

real

* Unen fat (#220)

* Add force parameter to Down method in SharedBuckleSystem

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* refactor

* LOX

* Update token remarks in Russian localization

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Bibi them for space

* Detective buff

* lint fix

* boom

* mo lint err

* no no

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>

* Added translation

* readd gate to map rotation (#6389)

* i think this is correct

* what the fuck

---------

Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>

* Kill mouse plague (#6428)

6% chance

* Update Credits (#6429)

Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>

* Sponsor got overwritten, return it

* And another return

* Tf

* increase pirate chaos scores (#6435)

FUUUUUUUUUUUCK

* better airlocks (#6434)

* Admeme punishment belt bounty (#6394)

* initial belt

* attributions.yml

* whip sound

* set the heldprefix right

* whip sound change

* Removed unused sprites

* chore: Automatically update REUSE headers

* Flips Slightly Less Evil Edition (#6436)

Fix some marty shitcode (dude wtf) and make stamina used by dodging, not flipping.

* slopstice major (#6440)

* why did i EVER merge ts, serversided for no reason, non-generic for no reason. SLOP. SLOP. SLOP.
RIP SLOPSTICE

* why did i EVER merge ts, serversided for no reason, non-generic for no reason. SLOP. SLOP. SLOP.
RIP SLOPSTICE

* bruh

* character editor in esc menu (#6444)

yea

* chore: Automatically update REUSE headers

---------

Signed-off-by: Bogdan Novikov <150541068+BohdanNovikov0207@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <administrator@goobstation.com>
Co-authored-by: gonz0 <105350621+doktor-gonz0@users.noreply.github.com>
Co-authored-by: DeusMaldPr <214400248+DeusMaldPr@users.noreply.github.com>
Co-authored-by: Airi Sezaki <airi@masquerading.agency>
Co-authored-by: Airi Sezaki <hina@masquerading.agency>
Co-authored-by: StrangerOfParadiseOG <atnion93@gmail.com>
Co-authored-by: Androidonator <33227516+Androidonator@users.noreply.github.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: Naxel <46362288+Naxel11@users.noreply.github.com>
Co-authored-by: Aiden <28298836+Aidenkrz@users.noreply.github.com>
Co-authored-by: BeanyBoi69 <92493635+BeanyBoi69@users.noreply.github.com>
Co-authored-by: thenumber <85048853+TheNumberRus@users.noreply.github.com>
Co-authored-by: the biggest bruh <199992874+thebiggestbruh@users.noreply.github.com>
Co-authored-by: _Syoga23_ <57214969+Syoga23@users.noreply.github.com>
Co-authored-by: NotActuallyMarty <27968892+NotActuallyMarty@users.noreply.github.com>
Co-authored-by: LuciferMkshelter <154002422+LuciferEOS@users.noreply.github.com>
Co-authored-by: Jvne <39907509+H2Owe@users.noreply.github.com>
Co-authored-by: Kenkaitos <240330945+Kenkaitos@users.noreply.github.com>
Co-authored-by: GNUtopia <93669372+GNUtopia@users.noreply.github.com>
Co-authored-by: whateverusername0 <113782077+whateverusername0@users.noreply.github.com>
Co-authored-by: gus <august.eymann@gmail.com>
Co-authored-by: Ted Lukin <fedorlukin2006@gmail.com>
Co-authored-by: Aviu00 <93730715+Aviu00@users.noreply.github.com>
Co-authored-by: N0lim <68152971+N0lim@users.noreply.github.com>
Co-authored-by: 10KE <151458027+10kee@users.noreply.github.com>
Co-authored-by: notactuallymarty <martynashagriefer@gmail.com>
Co-authored-by: RedTerror <37833085+RedTerrorDark@users.noreply.github.com>
Co-authored-by: Maxim Zvyagincev <max.zvyagincev@gmail.com>
Co-authored-by: Rouden <149893554+Roudenn@users.noreply.github.com>
Co-authored-by: TriviaSolari <154280615+TriviaSolari@users.noreply.github.com>
Co-authored-by: jellygato <aly.jellygato@gmail.com>
Co-authored-by: fishbait <gnesse@gmail.com>
Co-authored-by: Fishbait <Fishbait@git.ml>
Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Co-authored-by: taxisnacks <75760063+taxisnacks@users.noreply.github.com>
Co-authored-by: GoobAutomatedBot <247751749+GoobAutomatedBot@users.noreply.github.com>
Co-authored-by: Valniae <74309145+bbalint105@users.noreply.github.com>
Co-authored-by: Johnly <Jonhlybr@gmail.com>
Co-authored-by: sey <134509717+seyriix@users.noreply.github.com>
Co-authored-by: JrInventor05Next <205915704+JrInventor05Next@users.noreply.github.com>
Co-authored-by: Redrover1760 <39284090+Redrover1760@users.noreply.github.com>
Co-authored-by: hzlayer <57817247+hzlayer@users.noreply.github.com>
Co-authored-by: RedMush1 <88719613+RedMush1@users.noreply.github.com>
Co-authored-by: NotSoDamn <75203942+NotSoDana@users.noreply.github.com>
Co-authored-by: No Elka <125199100+noelkathegod@users.noreply.github.com>
Co-authored-by: madeline-celeste <224184098+madeline-celeste@users.noreply.github.com>
Co-authored-by: loltart <159829224+loltart@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: GoobBot <uristmchands@proton.me>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: Fritz Franz <fritzfranz1711@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: thinkfast <118076104+thinkfast1337-2@users.noreply.github.com>
Co-authored-by: liegend <2008.morozov.ri@gmail.com>
Co-authored-by: assripper. <130258577+caoimhan2008@users.noreply.github.com>
Co-authored-by: madeline-celeste <madeline-celeste@users.noreply.github.com>
Co-authored-by: Fat Engineer Gaming <159075414+Fat-Engineer-Gaming@users.noreply.github.com>
Co-authored-by: loltart <lo1tartyt@gmail.com>
Co-authored-by: harryhulse12-alt <harryhulse12@gmail.com>
Co-authored-by: PursuitInAshes <pursuitinashes@gmail.com>
Co-authored-by: DrSmugleaf <10968691+DrSmugleaf@users.noreply.github.com>
Co-authored-by: RedstonewolfX <108761527+RedstonewolfX@users.noreply.github.com>
Co-authored-by: dootythefrooty <137359445+dootythefrooty@users.noreply.github.com>
Co-authored-by: Richard Blonski <48651647+RichardBlonski@users.noreply.github.com>
Co-authored-by: CliveOcelot <165305605+CliveOcelot@users.noreply.github.com>
Co-authored-by: raincally <deepseadweller232321541@proton.me>
Co-authored-by: Kris <horacethetoweringthug@gmail.com>
Co-authored-by: Serj <184727191+IsNotAcceptable@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@VMSolidus VMSolidus VMSolidus approved these changes

@Pspritechologist Pspritechologist Pspritechologist approved these changes

Assignees

No one assigned

Labels

Changes: Audio Changes any ogg files Changes: C# Changes any cs files Changes: YML Changes any yml files Priority: 4-Low Should be resolved at some point Pull Request Mirror Mirrors a PR from another Repo. Automatically applied by mirror bot Size: 3-Medium For medium issues/PRs Status: Help Wanted Extra attention is needed Status: Needs Cleanup Someone has to clean this before merging Status: Needs Review Someone please review this Type: Feature Creation of or significant changes to a feature

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@SimpleStation14 @VMSolidus @Pspritechologist @DangerRevolution