4914 Commits

Author SHA1 Message Date
Aviu00
ddb73b266f Tweaks (#559)
* - tweak: Less bee health.

* - add: Uplink krait ammo.

* - add: ContextMenuInteractionBlockerComponent.

* - tweak: Update development config.

* - fix: Folder naming.

* - add: More logic.
2024-08-04 16:43:55 +03:00
ThereDrD0
0ce44fbe64 lobby update (#554) 2024-08-04 11:43:00 +03:00
Remuchi
467eb84d43 [WIP] [Tweak] Ограничение раздатчиков реагентов и прочих жидкостей. (#498)
* Reapply "Add limited-reagent dispensers (#23907)"

This reverts commit 531becd592.

# Conflicts:
#	Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
#	Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
#	Content.Shared/Chemistry/SharedReagentDispenser.cs
#	Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
#	Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
#	Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

* Reapply "Fix comp.Owner (#24206)"

This reverts commit 2d2405ff93.

* Reapply "Use old reagent dispenser beaker slot ID (#24209)"

This reverts commit 388424e2f3.

* Add a container display to dispenser UI (#25391)

* Implemented contents display for dispenser UI

* Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Resolve the netent into a euid first

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Add prediction to hand labeler labels (#25869)

Added prediction to labels

* scoopable ash and foam, solution transfer prediction (#25832)

* move SolutionTransfer to shared and predict as much as possible

* fully move OpenableSystem to shared now that SolutionTransfer is

* fix imports for everything

* doc for solution transfer system

* trolling

* add scoopable system

* make ash and foam scoopable

* untroll

* untroll real

* make clickable it work

* troll

* the scooping room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
# Conflicts:
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml

* Reagent dispenser UI (#27831)

* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`
# Conflicts:
#	Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

* Reagent dispenser UI (Again) (#27958)

* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`

* delete unused classes

* disable reagent button when container is empty

* Make things a bit bigger

* remove obsolete text color override

* пару фиксов поверх

* переводики хихиххи

* еще переводы

* feat: химические картриджи

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
2024-08-04 09:36:11 +03:00
Jabak
1adca3107a Merge remote-tracking branch 'upstream/master' into ups 2024-08-03 22:32:36 +03:00
ThereDrD0
48d6d8bab8 Апстрим изменений боргов (#549)
* New borg sounds (#27205)

* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor

* Make borgs shown in logprobe (#27788)

* Players can no longer see that emagged cyborgs' internals have been tampered with. (#27816)

* Add emag-detection funtionality to diag huds

* Add component to the omniHUD

* Fix namespace

* Adress discord review, just axe the message.

* Medical borg add chem glasses (#27843)

* Update borg_chassis.yml

* Update borg_chassis.yml

* fix

* Removing unnecessary components and adapting changes (#28391) for the syndicate

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Create Consistency in the Syndicate Borgs (#27875)

* Gives Mediborg the Medical Hud (#28391)

* Shifts borgs hats to the right a bit (#28600)

* Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children

* Prevent borgs from getting duplicate modules (#28943)

* Prevent borgs from getting duplicate modules

* outta the loop

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* fix borgs getting deleted by salvage magnets (#29006)

* Borgs can no longer be freely locked/unlocked when emagged (#29605)

Co-authored-by: plykiya <plykiya@protonmail.com>

* Added Health Analyzer to basic treatment module. (#29696)

Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>

* Add petting cyborgs (#30037)

added petting borgs, adjusted interactions

* Fix: Syndie borg can now wield DEsword (#30229)

* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu

* Revert "fix borgs getting deleted by salvage magnets (#29006)"

This reverts commit c6a2d3dc0d15b1f5535ad9fe2a481ec9cfd4f111.

* borgs sound change

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com>
Co-authored-by: marbow <152051971+marboww@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Co-authored-by: JIP <jipdawg93@gmail.com>
Co-authored-by: CookieMasterT <124045269+CookieMasterT@users.noreply.github.com>
Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
2024-08-03 18:53:54 +03:00
Aviu00
d4525a91e6 Fixes & more (#548)
* - fix: Narsie not spawning, items not dropping on paralyze, cult tweaks.

* - fix: Diagonal grilles layer.

* - add: Cockroaches don't drop organs.

* - add: Magic hands now work on interact & disable context menu interaction.

* - fix: Shackles speech after doafter.

* - tweak: Reduce flashbang knockdown, check for CanLieDown.

* - tweak: Hspear limit.

* - tweak: Remove knockdown tile friction.

* - tweak: Engi belt in sus box.

* - fix: Constructs can hear cult chat.

* - fix: Desword audio.

* - fix: Context menu.

* - fix: Actually drop items on paralyze.

* - tweak: Revert range reduction.

* - add: Update thermal visibility.

* - add: NPCs can miss.

* - tweak: Update desc.

* - fix: Actually fix desword audio.

* - tweak: Secret weights & game presets.

* - fix: Cult stun.
2024-08-03 18:23:46 +03:00
ThereDrD0
68ae47c958 return old telebaton (#546) 2024-08-03 17:02:07 +03:00
RedBurningPhoenix
aaee67ef51 StalinCVAR (#545) 2024-08-03 15:58:25 +03:00
PuroSlavKing
6ea2f2baf8 [Tweak] Better Telescopic Baton (#544)
* [Tweak] Better Telescopic Baton

* self defence loadout

* SDD4Inspector
2024-08-03 15:53:19 +03:00
Jabak
64ad5900c8 Merge remote-tracking branch 'upstream/master' 2024-08-02 23:26:33 +03:00
Aviu00
27268d4e28 Better melee combat (#542)
* - add: NextMobAttack, EquipCooldown.

* - fix: Some combat fixes.

* - add: Telebaton.

* - add: Stun baton rework.

* - tweak: Reduce melee range.

* - add: Rework melee block system.

* - add: ExaminedEvent.
2024-08-02 14:50:26 +03:00
Aviu00
c2fd356c5c Knockdown (#535)
* - add: Better knockdown.

* - add: Some stuff.

* - add: Ghetto alert.
2024-08-01 20:49:56 +03:00
Jabak
26cd9ad80c Merge remote-tracking branch 'upstream/master' into ups 2024-08-01 11:20:57 +03:00
ThereDrD0
567afd55c1 Респрайты алертов (#526)
* bleed alert respire + remove hardcoded shit from bloodstreamSystem

* resprite thirst icons

* ensnared alert meme resprite
2024-08-01 06:57:26 +03:00
Aviu00
c8548f8dd6 Felinid fixes and stuff. (#524)
* - add: Felinid fixes and stuff.

* - fix: Fix felinids disappearing.
2024-08-01 03:36:09 +03:00
Jabak
25ee6d15ce Axui 2024-07-31 20:36:59 +03:00
Spatison
aa883be67e Tweak: Таскать лежа стало сложнее (#517) 2024-07-31 07:21:03 +03:00
ThereDrD0
f001e3dcc6 Фиксы (#518)
* fix rcd ammo predicting

* fix tts preview

* cleanups HumanoidProfileEditor

* fix double chaplain bible

* loadout fixes

* fix handlabeler mispredicting

* fix resources couldnt be extracted due to the whitelist

* wd edit

* add security filled leather satchel to loadouts
2024-07-31 05:39:38 +03:00
Jabak
a583cfde09 Merge remote-tracking branch 'upstream/master' into ups 2024-07-31 01:26:23 +03:00
Aviu00
58574b8a70 Felinids fit in duffelbags. (#515)
* - add: Felinids fit in duffelbags.

* - add: This is better.

* - add: Move to shared.
2024-07-30 19:32:26 +03:00
Aviu00
2b5838657d Blood and more (#516)
* - tweak: Teleport only works on cultists.

* - add: Better twisted construction.

* - tweak: Free engivend.
2024-07-30 19:31:34 +03:00
Spatison
397e74079b Fix (#513)
* fix: Ботинки клоуна сново работают

* fix: Световое копье теперь исчезает если его передать
2024-07-30 03:13:05 +03:00
Aviu00
74e1f3c618 More blood (#514)
* - add: Some construct stuff.

* - add: Some rune stuff.

* - add: Unvisit.

* - add: Better blood rites.
2024-07-30 03:12:49 +03:00
Jabak
1b13471f98 Добавил музыкальную очередь в музыкальный автомат 2024-07-30 02:35:45 +03:00
Jabak
cb0da4cf65 Merge remote-tracking branch 'upstream/master' into ups 2024-07-29 12:58:16 +03:00
ThereDrD0
d627758826 Баффы (#510)
* Moodsystem cleanups

* remove overhydrated and overfed mood debuffs

* admins now join game deadmined + new player timers

* faster arrivals

* recharging rcd with metal, glass, plastic or cable coils

* better timings and costs + building apc and camera

* preparing for rpd

* RPD + make RCD more generic

* add rpd to atmos lockers, rcd to engivend

* rcd and rpd to technologies

* dont deadmin me in debug

* rcd ammo buff

* add ChargeCountModifier logic for non stackable items

* increase time to become experienced player

* Dynamic Radial Menus (#29678)

* fix

* Clean Some Code

* Some Commentaries

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* more dynamically parameters

---------

Co-authored-by: Rinary <72972221+Rinary1@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-07-29 06:04:21 +03:00
Spatison
bd7537f568 Fix (#508) 2024-07-28 21:02:54 +03:00
Aviu00
edf9f243a1 Blood (#507)
* - tweak: Nerf spear.

* - tweak: Blood bolt barrage.

* - add: Cult stuff.

* - fix: Cult fixes.

* - remove: Garbage.

* - fix: Multiple pylons.

* - fix: Pylon placement fix.

* - add: Lots of cult stuff.
2024-07-28 19:54:32 +03:00
Jabak
decd47769b Merge remote-tracking branch 'upstream/master' 2024-07-28 15:08:05 +03:00
ThereDrD0
e01ad5f2a7 Делаем разгермы более смешными (#492)
* update cvars

* Revert "update cvars"

This reverts commit f430afc2b2d531bf051d0043f14a6e4b6852a23d.

* better cvar set
2024-07-27 18:48:25 +03:00
RedBurningPhoenix
3ed0f2c4bb SUPER CAMERA(OCHKO) (#501)
* SUPER CAMERA(OCHKO)

* Удобный монитор камер и портативный мониторинг для детектива. (#25)

* Улучшение мониторинга камер

* Портативный монитор камер для дека

* чейнжлог

* Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)"

This reverts commit adf35bb8f6ddd6256b18841a81b330224ebff103.

* Revert "Revert "Удобный монитор камер и портативный мониторинг для детектива. (#25)""

This reverts commit bd30fe45046b7b8508e8277f8c186d03338354cd.

* cleanups

* its so over

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
Co-authored-by: drdth <drdtheuser@gmail.com>
2024-07-27 18:47:27 +03:00
Jabak
53e4d2bfe5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-26 21:32:42 +03:00
Spatison
e147c02db3 add: Теперь сняряды для Синано можно печатать (#499) 2024-07-26 16:53:25 +03:00
Spatison
cf4530e3a6 Shinano (#494)
* Shinano

* A < a
2024-07-25 16:33:11 +03:00
Aviu00
f9224ea2f5 Фиксы в основном (#495)
* - fix: No concealed rune interaction.

* - fix: Wizard rule min players.

* - add: Holosign stuff.

* - add: Don't despawn dragon.

* - tweak: Implants.

* - fix: Hijack.

* - remove: Hardsuit objective.

* - fix: Holosigns.

* - fix: Fix chair rotation.

* - fix: No shooting while delayed.

* - fix: Changeling felinid polymorph.

* - fix: Fix stuck in container in container.

* - fix: Fix flash in containers.

* - fix: Whistle chameleon.

* - fix: Loc.

* - fix: No shooting in body bags.

* - fix: Error.

* - fix: Ling felinid fix attempt 2.
2024-07-25 16:32:56 +03:00
Jabak
c47ef9eea5 Merge remote-tracking branch 'upstream/master' into ups 2024-07-25 14:32:04 +03:00
ThereDrD0
f56e97b122 Порт атмоса с ЕЕ + пара фиксво (#491)
* fix a lot of spaces in shuttle call reason

* fix tts fatal without api url

* Physics Based Air Throws (#342)

I've made it so that when a room is explosively depressurized(or when a
body of high pressure air flows into one of lower pressure air), that
entities inside are launched by the air pressure with effects according
to their mass. An entity's mass is now used as an innate resistance to
forced movement by airflow, and more massive entities are both less
likely to be launched, and will launch less far than others. While
lighter entities are launched far more easily, and will shoot off into
space quite quickly! Spacing departments has never been so exciting!
This can be made extraordinarily fun if more objects are given the
ability to injure people when colliding with them at high speeds.

As a note, Humans are very unlikely to be sucked into space at a typical
force generated from a 101kpa room venting into 0kpa, unless they
happened to be standing right next to the opening to space when it was
created. The same cannot be said for "Lighter-Than-Human" species such
as Felinids and Harpies. I guess that's just the price to pay for being
cute. :)

On a plus side, because the math behind this is simplified even further
than it was before, this actually runs more efficiently than the
previous system.

Nothing, this is basically done. I've spent a good 6 hours straight
finely tuning the system until I was satisfied that it reflects
something close to reality.

**Before the Space Wind Rework:**

https://github.com/Simple-Station/Einstein-Engines/assets/16548818/0bf56c50-58e6-4aef-97f8-027fbe62331e

**With this Rework:**

https://github.com/Simple-Station/Einstein-Engines/assets/16548818/6be507a9-e9de-4bb8-9d46-8b7c83ed5f1d

🆑 VMSolidus
- add: Atmospheric "Throws" are now calculated using object mass, and
behave accordingly. Tiny objects will shoot out of rooms quite fast!

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>

* fixes

---------

Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2024-07-24 22:40:38 +03:00
Jabak
68a4d06490 Merge remote-tracking branch 'upstream/master' into ups 2024-07-24 19:13:19 +03:00
ThereDrD0
0d99c5afe7 Фиксы (#488)
* add material storage component to whitemoose

* fix pickaxe inventory size

* fix free sponsor only races

* invisible aghost no longer visible in ghost warp menu

* add migration for BoxTrashbag

* fix make wizard admin verb

* fixed wizard components swap and new wizard marks as wizard in ghost warp menu now

* Stop eating food if you drop it (#29854)

* Stop eating food if you drop it

* woops, unused param

* comments

---------

Co-authored-by: plykiya <plykiya@protonmail.com>

* Eating and Drinking Doafter Change (#30060)

My lawyer told me to do this

Co-authored-by: plykiya <plykiya@protonmail.com>

* ActivatableUI tweaks (#27448)

* ActivatableUI tweaks

* EntGotRemovedFromContainerMessage

* A

* Revert "ActivatableUI tweaks (#27448)"

This reverts commit 5b311c6fdbf77db6838bdcf9993b98272d4ebeac.

* fix eating food from containers

* fix double captain duffel

* add bible for chaplain loadout

* possible bad fix for double security headsets

---------

Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
2024-07-24 02:19:13 +03:00
Jabak
624e6a9453 Merge remote-tracking branch 'upstream/master' 2024-07-23 19:02:41 +03:00
Aviu00
b64eea4b3f - fix: Chameleon projector. (#484) 2024-07-23 18:34:12 +03:00
Aviu00
f65c2e5c84 Flashbang tweaks. (#478)
* - tweak: Flashbang tweaks.

* - add: More flashbang stuff.
2024-07-22 20:06:02 +03:00
Jabak
af04e7e75f Merge remote-tracking branch 'upstream/master' into UPS 2024-07-22 19:24:10 +03:00
Aviu00
a8ffd3280a - tweak: Thermal tweaks. (#477) 2024-07-22 17:24:00 +03:00
Spatison
71d88bd053 add: Прототип гранатомета СБ (#479) 2024-07-22 17:20:16 +03:00
Aviu00
f82eee75b0 Thief stuff (#480)
* - add: Thief stuff.

* - fix: Implants.

* - add: Jammer.
2024-07-22 17:20:05 +03:00
Spatison
06b4a48b8f StunLock (#474)
* StunLock

* DisarmMalus

* Баланс
2024-07-21 20:55:01 +03:00
Jabak
69256bcb6d Merge remote-tracking branch 'upstream/master' into UPS 2024-07-21 20:30:35 +03:00
Aviu00
d0acfd7790 - add: Enhanced vision refactor. (#471) 2024-07-21 14:30:47 +03:00
Jabak
06405f8c62 Merge remote-tracking branch 'upstream/master' into ups 2024-07-20 18:45:46 +03:00