Vigers Ray
252e81c728
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Client/Administration/UI/Logs/AdminLogsControl.xaml.cs
# Content.Client/Administration/UI/Tabs/PlayerTab/PlayerTab.xaml.cs
# Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
# Content.Server/Mindshield/MindShieldSystem.cs
# Content.Shared/Gravity/SharedGravitySystem.cs
# Content.Shared/Implants/SharedSubdermalImplantSystem.cs
# Resources/Locale/en-US/_strings/traits/traits.ftl
# Resources/Prototypes/Entities/Clothing/Shoes/misc.yml
# Resources/Prototypes/Entities/Objects/Devices/Electronics/door_access.yml
# Resources/Prototypes/Entities/Objects/Misc/implanters.yml
# Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
# Resources/Prototypes/Entities/Objects/Specific/Mech/mechs.yml
# Resources/Prototypes/Entities/Objects/Weapons/Throwable/grenades.yml
# Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
# Resources/Prototypes/Entities/Structures/Machines/surveillance_camera_routers.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
2025-08-23 23:10:05 +03:00
Princess Cheeseballs
47dd036ef2
Prevent shoe buffs while crawling ( #39648 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-20 13:08:31 +02:00
Princess Cheeseballs
da23bc9dcc
Crawling Fixes Part 4: Can't crawl when weightless. ( #39099 )
...
* Init Commit
* Typos
* Commit 2
* Save Interaction Test Mob from failing
* ssss
* Confident I've gotten all the correct prototypes
* Whoops forgot to edit those
* aaaaa
* Better solution
* Test fail fixes
* Yaml fix
* THE FINAL TEST FIX
* Final fix(?)
* whoops
* Added a WeightlessnessChangedEvent
* Check out this diff
* Wait I'm dumb
* Final optimization and don't duplicate code
* Death to IsWeightless
* Moth directed targeted attack
* A
* Bugfixes and such
* Grrr
* Death
* Cleanup
* Cleanup 2
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-08-19 12:18:05 -07:00
iertis
d5ec9f0e5b
Фиксы апстрима ( #2778 )
...
Co-authored-by: Vigers Ray <vigersray@gmail.com>
2025-08-15 12:45:53 +03:00
Vigers Ray
7bdec90a3f
новая партия говна
2025-08-13 14:27:23 +03:00
Vigers Ray
3cf56cd5b3
Merge remote-tracking branch 'space-wizards/master'
...
# Conflicts:
# Content.Server/Access/Systems/AgentIDCardSystem.cs
# Content.Server/GameTicking/Rules/ChangelingRuleSystem.cs
# Content.Server/GameTicking/Rules/ThiefRuleSystem.cs
# Content.Server/Medical/SuitSensors/SuitSensorSystem.cs
# Content.Server/Zombies/ZombieSystem.cs
# Content.Shared/Clothing/EntitySystems/SharedChameleonClothingSystem.cs
# Content.Shared/Standing/StandingStateComponent.cs
# Content.Shared/Standing/StandingStateSystem.cs
# Content.Shared/Stunnable/SharedStunSystem.Knockdown.cs
# Content.Shared/Stunnable/SharedStunSystem.cs
# Resources/Locale/en-US/_strings/game-ticking/game-presets/preset-changeling.ftl
# Resources/Locale/en-US/_strings/ghost/observer-role.ftl
# Resources/Locale/en-US/_strings/robotics/borg_modules.ftl
# Resources/Prototypes/Entities/Clothing/Ears/specific.yml
# Resources/Prototypes/Entities/Clothing/Eyes/specific.yml
# Resources/Prototypes/Entities/Clothing/Hands/specific.yml
# Resources/Prototypes/Entities/Clothing/Head/specific.yml
# Resources/Prototypes/Entities/Clothing/Neck/specific.yml
# Resources/Prototypes/Entities/Clothing/OuterClothing/specific.yml
# Resources/Prototypes/Entities/Clothing/Shoes/specific.yml
# Resources/Prototypes/Entities/Clothing/Uniforms/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/animals.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
# Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
# Resources/Prototypes/Entities/Objects/Materials/parts.yml
# Resources/Prototypes/Entities/Objects/Specific/Robotics/borg_modules.yml
2025-08-13 14:13:30 +03:00
Vigers Ray
fb4ef153c8
я устал, смена окончена
2025-08-13 01:24:33 +03:00
Princess Cheeseballs
55335cce0f
Crawling Fixes 1: Dragons and Borgs can't do the worm. ( #39084 )
...
* Init Commit
* Remove unused code, fix stun visuals bug
* Update Content.Shared/Stunnable/SharedStunSystem.cs
* Some initial changes
* first batch of changes
* Commit
* One line cleanup
* KnockdownStatusEffect ain't worth it.
* Fix 2 bugs
* Fixes
* Remove that actually,
* Commit
* Better solution
* Alright final commit I think
* Add better remarks
* How the fuck did this not get pushed???
* Wait no why was my ryder trying to push that??? I didn't make that change! DON'T DO THAT!!!
* Review
* Don't log that
---------
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2025-08-10 10:49:29 -07:00
Princess Cheeseballs
e85bc1bb8c
Stunnable New Status and Cleanup ( #38618 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-07-21 19:22:11 +02:00
Princess Cheeseballs
8f7e6096f2
Crawling Fixes Part 5: Holy Fuck ( #39109 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-07-21 11:08:04 +02:00
Princess Cheeseballs
99b431cafd
Crawling Fix 3: OOPS!!! ( #39089 )
...
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-07-20 23:35:49 +02:00
Princess Cheeseballs
dec2d42a1d
Crawling Part 1: The Knockdownening ( #36881 )
...
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-07-20 01:54:42 +02:00
