Jabak
e48a5da724
Rules
2024-08-21 15:28:00 +03:00
keslik
35e1305725
Fix: New statuses radio messages fix ( #650 )
2024-08-21 01:01:33 +03:00
Jabak
b6d3c050a0
Queue in JukeBox ( #640 )
...
* Queue in JukeBox
* Translation JukeBox
2024-08-19 21:11:35 +03:00
ThereDrD
c28a330372
rename white dream to giedi prime ( #635 )
2024-08-19 03:27:31 +03:00
Jabak
f0f3935385
Merge remote-tracking branch 'upstream/master' into ups
2024-08-17 02:38:56 +03:00
keslik
775fd5e96c
[Tweak] Security statuses micro update ( #629 )
...
* Tweak: Sec statuses update WIP
* fix: Для новых статусов требуется указать причину
* Fix: for review
2024-08-16 23:46:26 +03:00
Jabak
1f1d61dc82
Merge remote-tracking branch 'upstream/master' into ups
2024-08-14 22:54:19 +03:00
uaNoName
3af8d4b8c9
Brigmedic reanimation ( #619 )
...
* Brigmedic reanimation
* fixes ver. 2
* oops
* feature/some-new-sprites
2024-08-14 22:24:31 +03:00
RedBurningPhoenix
fe962862d4
Ресурсы и лодауты новых ролей ( #617 )
...
* Triumph, Slang and Vends
* govno
* New bomzh and maid resources
* oops
* fixed
* oops
2024-08-14 21:28:05 +03:00
Aviu00
afd52833a9
- add: Better telescope keybind. ( #618 )
2024-08-14 21:27:24 +03:00
Jabak
cbd6a8cff2
Merge remote-tracking branch 'upstream/master' into ups
2024-08-13 22:18:51 +03:00
keslik
be66fab51d
Fix fire costumes stats ( #616 )
2024-08-13 01:34:09 +03:00
Jabak
dbb90cab56
Merge remote-tracking branch 'upstream/master' into ups
2024-08-11 18:33:08 +03:00
Aviu00
e14b6cb948
Cult spells update ( #607 )
...
* - add: CultSystem.BloodSpells.
* - add: Cleanup.
2024-08-11 13:55:01 +03:00
RedBurningPhoenix
c48ce9c66a
MAID AND BOMZH ( #605 )
...
* First
* Second
* oops
* translate
2024-08-11 00:12:23 +03:00
RinKeeper
3acbcaf41e
Spells ( #599 )
...
* rod form spell
* blind spell
* mutate spell
2024-08-09 22:10:42 +03:00
ThereDrD
8e4ebf02aa
Revert "Goida revert ( #600 )" ( #601 )
...
This reverts commit a95fe131
2024-08-09 21:08:34 +03:00
MJSailor
a95fe13180
Goida revert ( #600 )
...
* Revert "- fix: YAML linter fixes. (#598 )"
This reverts commit 012bf3c357cf1c3a9af5#597 )"
This reverts commit b000423999#596 )"
This reverts commit 00fbdead770d7a12b2a2#593 )"
This reverts commit 943c77031c#594 )"
This reverts commit 143c010a89#595 )"
This reverts commit 4cd0100ac708eadc690f#591 )"
This reverts commit 343f3612eb#592 )"
This reverts commit 3f97bdce2f0678eca250#590 )"
This reverts commit 2b9e5e2437#580 )"
This reverts commit e01a47b089#588 )"
This reverts commit c80a2985f2#585 )"
This reverts commit 713b16bb98#587 )"
This reverts commit a6a69cc60f#586 )"
This reverts commit 48c86bd846#583 )"
This reverts commit cced3cc98babf435b11d#584 )"
This reverts commit 3608960f5c#579 )"
This reverts commit 9a9c9598e044447d573f0c4d082ad356473c5492d1cb0cb364#578 )"
This reverts commit 14755808af0133f82722#576 )"
This reverts commit b7cc49896c#574 )"
This reverts commit a22cf3d50b#573 )"
This reverts commit bb7140f3d4#572 )"
This reverts commit 4db96dc569#571 )"
This reverts commit 94ea756794#564 )"
This reverts commit d023d29e5427e7f25f7e6a384246b8
2024-08-09 19:09:22 +03:00
Aviu00
00fbdead77
Modules update ( #596 )
...
* - add: Update module sprites.
* - add: Modules update.
2024-08-09 15:36:35 +03:00
Jabak
412b9f82cb
Merge remote-tracking branch 'upstream/master' into ups
2024-08-09 15:33:30 +03:00
Spatison
343f3612eb
fix: Maximum message size ( #591 )
2024-08-09 02:37:42 +03:00
ThereDrD
3f97bdce2f
Черри пики 7 ( #592 )
...
* Remake gasp popup to emote (#27736 )
* fix
* Silence ringtones on admin PDAs (#29801 )
* Silence ringtones on invisible PDAs
* Revert "Silence ringtones on invisible PDAs"
This reverts commit afc1041f31eebe82e83630a856a8856b877a9826.
* Literally just this
* Add an admin announcement for news article publishing
* Fix invalid UI hover/click sounds breaking client (#30067 )
fixes #29561
* Display the administrator's title in ahelp and ahelp relay (#30075 )
* Adding the admin prefix to the ahelp
* Updating the admin prefix
* The second update of the admin prefix
* Configuration correction
* fix
* Fix servers ambience sound (#30091 )
* Fix servers ambience
* I'm silly
* Clean up
* Add pen clicking sound (#30531 )
* Add pen clicking sound
* switch to OnUse and reduce distance a little
* Fix exploding pen clicking (#30533 )
* fix pens
* added a bunch more fox noises (#27578 )
* fuck it we ball
* added recommended copyright information
* revised copyright license
* revised copyright license x2
* finalized the fops
# reduced the number of audio clips
# adjusted the volume of all fox sounds to be consistent with each other
* added new sounds to the overall fox parent mob because we forgot oopsie
---------
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com >
Co-authored-by: Tayrtahn <tayrtahn@gmail.com >
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com >
Co-authored-by: to4no_fix <156101927+chavonadelal@users.noreply.github.com >
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.com >
Co-authored-by: themias <89101928+themias@users.noreply.github.com >
Co-authored-by: nao fujiwara <awkwarddryad@gmail.com >
2024-08-09 02:37:34 +03:00
uaNoName
e01a47b089
Нижнее бельё в лодауты ( #580 )
...
* Reapply "Reapply "Нижнее бельё в лодауты""
This reverts commit 44447d573f
2024-08-08 21:50:56 +03:00
Jabak
770b21c3f3
Merge remote-tracking branch 'upstream/master' into ups
2024-08-08 21:07:07 +03:00
Spatison
cced3cc98b
Сообщения в ПДА 2 ( #583 )
...
* add: AdminLog
* tweak: clean up
* fix: Changeling -> Network
* add: сортировка сообщений
* fix: ТексТ
2024-08-08 13:20:06 +03:00
Aviu00
3608960f5c
Chem stuff and more ( #584 )
...
* - tweak: Ressurect meth and ephedrine.
* - add: Emag fun.
* - tweak: Fire bomb buff.
* - fix: Uplink loc.
* - tweak: Syringe.
2024-08-08 12:07:40 +03:00
Aviu00
9a9c9598e0
JobRequiremet refactor ( #579 )
...
* JobRequirement refactor (#30347 )
* refactor JobRequirements
* add profile support
* fix
* Update quartermaster.yml
* sloth fixes
* inport 30208
* Update DepartmentPrototype.cs
* species restriction
* left tweak stick
* stringbuilder is cool!
* Add JobRequirementOverride prototypes (#28607 )
* Add JobRequirementOverride prototypes
* a
* invert if
* Add override that takes in prototypes directly
* - fix: Errors.
* - add: Add stuff.
* - fix: Formatted message fix.
* - add: Another requirement.
---------
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com >
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com >
2024-08-07 20:30:43 +03:00
uaNoName
44447d573f
Revert "Reapply "Нижнее бельё в лодауты""
...
This reverts commit 0c4d082ad3
2024-08-07 17:50:00 +03:00
uaNoName
0c4d082ad3
Reapply "Нижнее бельё в лодауты"
...
This reverts commit 56473c5492
2024-08-07 17:49:39 +03:00
uaNoName
56473c5492
Revert "Нижнее бельё в лодауты"
...
This reverts commit d1cb0cb364
2024-08-07 17:49:22 +03:00
uaNoName
30b48c3c13
Merge remote-tracking branch 'origin/master' into loadouts
2024-08-07 17:35:36 +03:00
uaNoName
d1cb0cb364
Нижнее бельё в лодауты
2024-08-07 17:24:19 +03:00
RedBurningPhoenix
bb7140f3d4
Воровские перчатки ( #573 )
...
* Change ThievingGloves Uplink
little thing
* Change ThievingGloves DESC
2024-08-07 07:19:24 +03:00
Jabak
49dbede859
Merge remote-tracking branch 'upstream/master' into ups
2024-08-06 21:28:20 +03:00
Spatison
d023d29e54
Сообщения в ПДА ( #564 )
...
* add: Сообщения в ПДА
* Search bar and colors in messages on the PDA
2024-08-06 16:58:30 +03:00
Aviu00
c719eb56e0
- tweak: Lightning and fireball.
2024-08-05 19:17:30 +03:00
Aviu00
945477d7e7
- add: Update desc.
2024-08-05 16:04:42 +03:00
Jabak
7f0346db02
Update EstrogenPlus
2024-08-04 20:41:03 +03:00
Jabak
2e54a96cea
Merge remote-tracking branch 'upstream/master' into ups
2024-08-04 17:20:15 +03:00
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
Remuchi
467eb84d43
[WIP] [Tweak] Ограничение раздатчиков реагентов и прочих жидкостей. ( #498 )
...
* Reapply "Add limited-reagent dispensers (#23907 )"
This reverts commit 531becd592#24206 )"
This reverts commit 2d2405ff93#24209 )"
This reverts commit 388424e2f3#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
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
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
Spatison
85d4e4dc0d
Add: Krait ( #523 )
2024-08-01 03:36:17 +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
