Zekins
14d7edee05
Merge remote-tracking branch 'upstream/april-fools-2025-upstream' into April
2025-04-01 00:48:46 +03:00
Zekins
6a18780343
Merge branch 'April' of https://github.com/corvax-team/ss14-wega into April
2025-03-31 22:37:40 +03:00
Zekins
1a09d75354
Merge remote-tracking branch 'origin/master' into April
2025-03-31 22:30:28 +03:00
Zekins
fb33ccee11
Merge pull request #77 from corvax-team/upstream
...
Апстрим обычный
2025-03-31 22:28:01 +03:00
Zekins
f78e8d8457
Merge remote-tracking branch 'upstream/master'
2025-03-31 22:26:25 +03:00
Zekins
6ac828f569
Merge pull request #76 from corvax-team/void
...
Пустотники
2025-03-31 21:32:19 +03:00
Zekins
ccfe0351f2
upvoid
2025-03-31 21:26:36 +03:00
JerryImMouse
c23943d51b
fix(april-fools): Fix metas. Bad fix, but this is only for 1 day, man
2025-03-31 23:19:28 +05:00
JerryImMouse
f76e60cc61
fix(april-fools): Fix tests
2025-03-31 23:08:08 +05:00
JerryImMouse
ff2f2ecf5c
fix(april-fools): Resolve Corvax & Wizards Vulpkanins >w<
2025-03-31 22:05:48 +05:00
Zekins
942d8826a6
Merge branch 'master' of https://github.com/corvax-team/ss14-wega
2025-03-31 19:41:39 +03:00
Zekins
33b465af16
addvoid
2025-03-31 19:38:31 +03:00
JerryImMouse
a9d0433a65
Merge remote-tracking branch 'upstream/april-fools-2025' into april-fools-2025-upstream
...
# Conflicts:
# Content.Server/RoundEnd/RoundEndSystem.cs
# Content.Shared/Clothing/EntitySystems/HideLayerClothingSystem.cs
# Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
# Resources/Prototypes/Entities/Mobs/NPCs/pets.yml
# Resources/Prototypes/GameRules/events.yml
# Resources/Prototypes/Guidebook/species.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/bagel.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/marathon.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/omega.yml
# Resources/Prototypes/Maps/packed.yml
# Resources/Prototypes/Maps/saltern.yml
# Resources/Prototypes/Maps/train.yml
# Resources/Prototypes/radio_channels.yml
# Resources/ServerInfo/Guidebook/Mobs/Dwarf.xml
# Resources/ServerInfo/Guidebook/Mobs/Species.xml
# Resources/ServerInfo/Guidebook/NewPlayer/YourFirstCharacter.xml
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/icon.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Back/Backpacks/security.rsi/meta.json
# Resources/Textures/Clothing/Back/Duffels/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Duffels/security.rsi/icon.png
# Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Back/Duffels/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Back/Duffels/security.rsi/meta.json
# Resources/Textures/Clothing/Back/Satchels/security.rsi/equipped-BACKPACK.png
# Resources/Textures/Clothing/Back/Satchels/security.rsi/icon.png
# Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Back/Satchels/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Back/Satchels/security.rsi/meta.json
# Resources/Textures/Clothing/Belt/security.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/security.rsi/icon.png
# Resources/Textures/Clothing/Belt/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/security.rsi/meta.json
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/equipped-BELT.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/icon.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-left.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/inhand-right.png
# Resources/Textures/Clothing/Belt/securitywebbing.rsi/meta.json
# Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon.png
# Resources/Textures/Clothing/Ears/Headsets/security.rsi/icon_alt.png
# Resources/Textures/Clothing/Ears/Headsets/security.rsi/meta.json
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES-hamster.png
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/equipped-EYES.png
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/icon.png
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-left.png
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/inhand-right.png
# Resources/Textures/Clothing/Eyes/Glasses/secglasses.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/deathsquad.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/luxury.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/rd.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/security-red.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/security-warden.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon-flash.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/off-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/security.rsi/on-equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hardsuits/spatiohelm.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiecommander.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/syndiemedic.rsi/meta.json
# Resources/Textures/Clothing/Head/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_hos.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET-hamster.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/beret_security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/icon.png
# Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Hats/security_trooper_hat.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET-vox.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/equipped-HELMET.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/inhand-right.png
# Resources/Textures/Clothing/Head/Helmets/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Helmets/spaceninja.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/bio.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/cmo.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/general.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/janitor.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/scientist.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/Bio/virology.rsi/meta.json
# Resources/Textures/Clothing/Head/Hoods/rad.rsi/meta.json
# Resources/Textures/Clothing/Mask/blushingclown.rsi/meta.json
# Resources/Textures/Clothing/Mask/breath.rsi/meta.json
# Resources/Textures/Clothing/Mask/gas.rsi/meta.json
# Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json
# Resources/Textures/Clothing/Mask/italian_moustache.rsi/meta.json
# Resources/Textures/Clothing/Mask/medical.rsi/meta.json
# Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json
# Resources/Textures/Clothing/Mask/mime.rsi/meta.json
# Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json
# Resources/Textures/Clothing/Mask/ninja.rsi/meta.json
# Resources/Textures/Clothing/Mask/plaguedoctormask.rsi/meta.json
# Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json
# Resources/Textures/Clothing/Mask/sterile.rsi/meta.json
# Resources/Textures/Clothing/Mask/swat.rsi/meta.json
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/icon.png
# Resources/Textures/Clothing/Neck/Cloaks/hos.rsi/meta.json
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/equipped-NECK.png
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/icon.png
# Resources/Textures/Clothing/Neck/mantles/hosmantle.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Bio/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Coats/hos_trenchcoat.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Coats/warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/atmospherics.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/basic.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/capspace.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering-white.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/engineering.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/medical.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/salvage.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-red.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-left.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security-warden.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/security.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/spatio.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndicate.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/syndieelite.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/wizard.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Suits/eva_emergency.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_alt.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/hos_parade.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/security_grey.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/senior_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpskirt/warden.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_alt.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_grey.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/hos_parade.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_grey.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING-monkey.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-left.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/inhand-right.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/senior_officer.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/equipped-INNERCLOTHING.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/icon.png
# Resources/Textures/Clothing/Uniforms/Jumpsuit/warden.rsi/meta.json
# Resources/Textures/Interface/Alerts/breathing.rsi/meta.json
# Resources/Textures/Interface/Alerts/human_dead.rsi/dead.png
# Resources/Textures/Structures/Storage/closet.rsi/hos_door.png
# Resources/Textures/Structures/Storage/closet.rsi/sec_door.png
# Resources/Textures/Structures/Storage/closet.rsi/warden_door.png
2025-03-31 21:02:56 +05:00
Milon
d116439016
Not so automatic changelog update
2025-03-31 16:36:12 +02:00
Milon
4dd8a2a6df
Merg ( #36229 )
2025-03-31 16:35:23 +02:00
Milon
b1f82397c1
Revert "Fix broken layer hiding on clothes with multiple equipment slots ( #34080 )"
...
This reverts commit 2e7f01b9milonpl.git@proton.me >
2025-03-31 16:22:35 +02:00
Milon
67580abcbb
yes i can
2025-03-31 15:57:10 +02:00
Milon
37acbbe29f
a
2025-03-31 15:48:33 +02:00
Milon
b5ed1d305e
Merge remote-tracking branch 'upstream/stable' into merg
2025-03-31 15:46:57 +02:00
Sparlight
b138a3a36e
[April Fools] Add borgis ( #35376 )
...
* Add borgis
* Fix localization issue
* Fix da lint
* Borgis are now crew
* Exploded invalids in shuttle
* Fix ERROR overlay when a borgi has a brain installed
* Fix the linter concerns
* Add borgis
* Fix localization issue
* Fix da lint
* Borgis are now crew
* Exploded invalids in shuttle
* Fix ERROR overlay when a borgi has a brain installed
* Fix the linter concerns
* Let the dawgs wear some clothes
* Fix RSI issue
* Add borgis
* Fix localization issue
* Fix da lint
* Borgis are now crew
* Exploded invalids in shuttle
* Fix ERROR overlay when a borgi has a brain installed
* Fix the linter concerns
* Add borgis
* Fix da lint
* Borgis are now crew
* Fix ERROR overlay when a borgi has a brain installed
* Fix the linter concerns
* Let the dawgs wear some clothes
* Fix RSI issue
* Update Resources/Locale/en-US/reagents/meta/fun.ftl
Juice that makes you a corgi real
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
* Removed references to yours truly
* Fixed some hardsuit helmets; minor reagent-based tweaks based on latest adminbus work
* Fixed some clothing being unequippable by borgis
* Dropped borgi shuttle - will atomize into different PR if needed
* do it you won't
* review
* forgot localization highly real
---------
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com >
Co-authored-by: Milon <milonpl.git@proton.me >
2025-03-31 15:40:36 +02:00
qwerltaz
20c962aae1
[april fools] The world feels different today. You examine objects around you but can't quite make out what's in front of you. ( #35879 )
...
* maybeAccentuate
* accentuate examine nodes
* working prototype
* random accentuator
* fix SingleAccentuator.cs
* french, mumble, slurred
* mobster, pirate, stutter
* remove examine prediction (for one day)
* random accents per examine, not per sentence
* Revert "random accents per examine, not per sentence"
This reverts commit 0dfa644bb760e4b3f760f43db8870f43ea75e64d.
* crew manifest
* tweak examine reaccentuation chance
* alert level announcement
* event centcom announcements
* tweak accent system signatures
* nuke annoucement, tweak manifest chance
* accentuation rarer and a bit more messed up
* examine tooltips
* more centcom announcements
* reformat
* sophisticated reformatting
* less
* tweak
---------
Co-authored-by: Milon <milonpl.git@proton.me >
2025-03-31 14:35:12 +02:00
Hannah Giovanna Dawson
e518b28861
[April Fools] Give all the station pets a holiday, wawa! ( #35693 )
...
* [April Fools] Give the stations' pets a holiday, wawa
* Remove backflip, wawa.
* Unfuck
* displacement maps wawawaa
* displacement improvements, wawa
* Fix jumpsuits, wawa
* The scurret, it (does not) scream like a man
* WEWLAD also goes on holiday
* Finalize PR
* Attribs fix
* nubby nubb wawa
* maus
* fix wawa antag selection
* Update Content.Server/GameTicking/Rules/Components/GeneralScurretMayhemComponent.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-03-31 13:55:24 +02:00
LaCumbiaDelCoronavirus
2b0da6c1b9
[april fools] nuke timer calibration station event ( #35816 )
...
* :trollface:
* guh
* fix delay
* errrrr
* i forgot about this
* do not end round if calibrating nuke is defused
* undefang the nuke
* datafields
* oops
---------
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com >
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-03-31 13:20:32 +02:00
Eduard21st
bdfe184e62
10 and 14
2025-03-31 19:57:27 +09:00
Killerqu00
f8b96d39b7
[April Fools] Very Bad Day ( #35691 )
...
* very bad day preset
* unpowerAll systems and components
* make everyone hurt and drunk
* the rest is done
* turn very bad day into very bad 15 minutes godo
2025-03-31 12:57:04 +02:00
Eduard21st
739082be4e
6, nuclear rickroll
2025-03-31 17:21:45 +09:00
Zekins
e7556659a5
fixargument
2025-03-31 01:22:47 +03:00
Zekins
8d389c2d24
Merge pull request #75 from corvax-team/maps
...
Обновка карт
2025-03-31 00:39:49 +03:00
Zekins
49f971908d
fix
2025-03-31 00:38:45 +03:00
Zekins
6a6f4fe0c9
mapsupdate
2025-03-31 00:18:14 +03:00
Psychpsyo (Cameron)
7d189995e1
[April Fools] Live mop bucket: Actually change name in all places ( #36208 )
...
Living mop bucket: Actually change name in all places
2025-03-30 22:28:30 +02:00
Zekins
04a40a7820
Merge pull request #73 from corvax-team/genetic
...
Генетика
2025-03-30 22:47:14 +03:00
Kill_Me_I_Noobs
3d1111c3c0
Make JPEG a PNG (Corvax Edit) ( #2897 )
2025-03-30 18:20:54 +02:00
lapatison
1adf045584
Various locale tweaks ( #2988 )
...
Co-authored-by: lapatison <lapatisonsocial+gitkraken@gmail.com >
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
2025-03-30 18:20:16 +02:00
LoopDog
f9ea5b56f1
Adding HoS Shoulder Mantle to Uniform Printer and HoS-Loadout ( #3027 )
...
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
2025-03-30 18:19:44 +02:00
Pok
cf5af0c567
fix job descriptions grammar ( #3040 )
2025-03-30 18:18:00 +02:00
lapatison
2683826e9d
Update hiddenDescription.ftl [Locale fix] ( #3041 )
2025-03-30 18:09:58 +02:00
MureixloI
814a636eac
Returning sprites before cabinetification ( #3055 )
2025-03-31 00:35:52 +12:00
No Elka
8ea1df0c2c
[April Fools] Fix a typo ( #36183 )
...
not funny :(
2025-03-30 13:13:01 +02:00
Zekins
52ae1914fa
miniupinteractionpanel
2025-03-30 13:52:05 +03:00
Zekins
4be2ce99c1
configchange
2025-03-30 13:29:09 +03:00
Zekins
a7ab7a6702
remloggerblet
2025-03-30 12:11:11 +03:00
Zekins
a1ded2de91
adddeepcloning
2025-03-30 11:49:52 +03:00
Eduard21st
5c0d7de51f
5 and tag fix
2025-03-30 11:51:42 +09:00
Psychpsyo (Cameron)
dbd2f853d3
[April Fools] Add living mop bucket ghost role ( #36116 )
...
* Add living mop bucket ghost role
* review
---------
Co-authored-by: Milon <milonpl.git@proton.me >
2025-03-30 00:06:45 +01:00
Jackson Langley
394ec9fd0c
[April Fools] Random uplink balance ( #35366 )
...
* Okay
* Fix tests
* funny
* Die
* Update Content.Server/Traitor/Uplink/UplinkSystem.cs
---------
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com >
2025-03-29 23:56:18 +01:00
Skye
d1cdd2b1f1
[April Fools] The Right Honourable Members of Command, part 2 ( #36170 )
...
Job titles were too long, oops!
2025-03-29 23:53:57 +01:00
robinthedragon
a2f0d44322
[april fools] adds a flash to all command items ( #35374 )
...
* adds flash to items
* flashers on pets
2025-03-29 23:46:43 +01:00
compilatron
78f86bb830
[APRIL FOOLS] Claustrophobia Station ( #35551 )
...
* Initial Commit
* Fixes 1
* Why does that test exist?...
* Fixes 2
---------
Co-authored-by: jbox1 <40789662+jbox144@users.noreply.github.com >
2025-03-29 23:21:54 +01:00
Hannah Giovanna Dawson
7546ae2fc7
[April Fools] Hristovs oneshot ( #35656 )
...
* oneshot
* Update snipers.yml
* Update antimateriel.yml
* Update antimateriel.yml
* Update antimateriel.yml
cring
* Update antimateriel.yml
* Update theater.yml
removed bullets
2025-03-29 22:26:24 +01:00
