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

19 KiB

Raw Blame History

View Raw