Skip to content

Commit

Permalink
Upstream1308 (#232)
Browse files Browse the repository at this point in the history 
<!-- ЭТО ШАБЛОН ВАШЕГО PULL REQUEST. Текст между стрелками - это
комментарии - они не будут видны в PR. -->

## Описание PR
<!-- Ниже опишите ваш Pull Request. Что он изменяет? На что еще это
может повлиять? Постарайтесь описать все внесённые вами изменения! -->

<details><summary>Лист чейнжлогов, просто вставлю сюда списком, сами
гляните</summary>

## Admin.yml
```yml
- author: Mervill
  changes:
  - message: added a debug command to make you thirsty
    type: Add
  id: 48
  time: '2024-08-02T15:49:08.0000000+00:00'
  url: space-wizards/space-station-14#30562
- author: Repo
  changes:
  - message: Players that aHelped in Current round stay at top of bwoink list.
    type: Fix
  id: 49
  time: '2024-08-02T18:58:00.0000000+00:00'
  url: space-wizards/space-station-14#30580
- author: Mervill
  changes:
  - message: added a debug command to set either your hunger or thirst value to a
      given threshold
    type: Add
  id: 50
  time: '2024-08-05T07:36:26.0000000+00:00'
  url: space-wizards/space-station-14#30563
- author: nikthechampiongr
  changes:
  - message: The player panel has now been added and can be invoked with the playerpanel
      command. It will display general information on the selected player, as well
      as allow for general actions to be performed on them.
    type: Add
  id: 51
  time: '2024-08-09T05:33:26.0000000+00:00'
  url: space-wizards/space-station-14#30238
- author: Repo
  changes:
  - message: Accurate Panic bunker and Baby Jail conditions.
    type: Fix
  id: 52
  time: '2024-08-09T05:48:01.0000000+00:00'
  url: space-wizards/space-station-14#30581
- author: Simyon
  changes:
  - message: You can now view and edit the laws of silicons. Cyborg/Law bound entity
      -> Admin -> Manage laws
    type: Add
  id: 53
  time: '2024-08-09T06:16:22.0000000+00:00'
  url: space-wizards/space-station-14#28483
- author: TsjipTsjip
  changes:
  - message: Explosion damage dealt to players is now logged again.
    type: Add
  id: 54
  time: '2024-08-09T06:24:05.0000000+00:00'
  url: space-wizards/space-station-14#29762
- author: Repo
  changes:
  - message: Admin logs for Cubes and other rehydration.
    type: Add
  id: 55
  time: '2024-08-09T06:24:19.0000000+00:00'
  url: space-wizards/space-station-14#30597
- author: Errant
  changes:
  - message: The setgamepreset command now only sets the gamemode for a limited number
      of rounds, specified by a second parameter. Afterwards it switches back to the
      server default. Omitting the number parameter sets it for 1 round only. To change
      the game mode for a longer period, either specify a high number or change the
      game.fallbackpreset cvar so it will reset to what you want
    type: Tweak
  id: 56
  time: '2024-08-09T07:04:19.0000000+00:00'
  url: space-wizards/space-station-14#30756
- author: Ko4erga
  changes:
  - message: Added new markup decals.
    type: Add
  id: 57
  time: '2024-08-09T07:06:37.0000000+00:00'
  url: space-wizards/space-station-14#30374
```


## Changelog.yml
```yml
- author: slarticodefast
  changes:
  - message: The digital audio workstation can now be rotated.
    type: Tweak
  id: 7033
  time: '2024-08-02T10:02:16.0000000+00:00'
  url: space-wizards/space-station-14#30571
- author: slarticodefast
  changes:
  - message: Added potassium iodide. It gives you short term radiation protection
      and can be found in radiation treatment kits.
    type: Add
  - message: Added haloperidol. It removes most stimulating/hallucinogenic drugs from
      the body and makes you drowsy.
    type: Add
  - message: Added the drowsiness status effect. It blurs your vision and makes you
      randomly fall asleep. Drink some coffee or cola to remove it.
    type: Add
  - message: Chloral hydrate now makes you drowsy instead of forcing you to sleep
      instantly.
    type: Tweak
  id: 7034
  time: '2024-08-02T17:12:08.0000000+00:00'
  url: space-wizards/space-station-14#27454
- author: Blackern5000
  changes:
  - message: Winter boots no longer have ugly outlines
    type: Tweak
  id: 7035
  time: '2024-08-02T23:05:19.0000000+00:00'
  url: space-wizards/space-station-14#30350
- author: lzk228
  changes:
  - message: Figurines will say phrases on activation.
    type: Add
  id: 7036
  time: '2024-08-03T14:06:04.0000000+00:00'
  url: space-wizards/space-station-14#30455
- author: JoelZimmerman
  changes:
  - message: Dank pizza is now cooked with cannabis leaves instead of ambrosia vulgaris.
    type: Tweak
  id: 7037
  time: '2024-08-03T14:07:21.0000000+00:00'
  url: space-wizards/space-station-14#30430
- author: Ian321
  changes:
  - message: Help menus now include the linked guides.
    type: Fix
  id: 7038
  time: '2024-08-04T03:32:10.0000000+00:00'
  url: space-wizards/space-station-14#30462
- author: DrSmugleaf
  changes:
  - message: The Toggle Internals verb no longer shows up in the context menu if no
      breathing tool is equipped and internals are off.
    type: Tweak
  id: 7039
  time: '2024-08-04T03:34:56.0000000+00:00'
  url: space-wizards/space-station-14#30622
- author: Mervill
  changes:
  - message: Rotten Meat can be collected in trash bags and deleted by the recycler
    type: Tweak
  id: 7040
  time: '2024-08-04T10:13:57.0000000+00:00'
  url: space-wizards/space-station-14#30594
- author: DrSmugleaf
  changes:
  - message: Fixed the client sometimes falsely showing the red color flash effect
      when attacking something that they can't, like allied xenonids.
    type: Fix
  id: 7041
  time: '2024-08-05T03:14:01.0000000+00:00'
  url: space-wizards/space-station-14#30661
- author: Killerqu00
  changes:
  - message: Sleeper agents event no longer occurs when evacuation is called.
    type: Tweak
  id: 7042
  time: '2024-08-05T03:17:53.0000000+00:00'
  url: space-wizards/space-station-14#30646
- author: Cojoke-dot
  changes:
  - message: Mice can now use combat mode with a 0 damage attack
    type: Tweak
  id: 7043
  time: '2024-08-05T03:26:28.0000000+00:00'
  url: space-wizards/space-station-14#30487
- author: TheShuEd
  changes:
  - message: Nanotrasen has introduced recruitment rules. Characters under the age
      of 20 are no longer allowed to take on the role of head.
    type: Tweak
  id: 7044
  time: '2024-08-05T04:25:49.0000000+00:00'
  url: space-wizards/space-station-14#30347
- author: foboscheshir
  changes:
  - message: added missing mime mask sprites for Vox - scared and sad.
    type: Add
  id: 7045
  time: '2024-08-05T06:09:35.0000000+00:00'
  url: space-wizards/space-station-14#30607
- author: SlamBamActionman, PolarTundra
  changes:
  - message: Thief's Syndie Kit now comes with a Radio Jammer, a lighter and a Syndicate
      codeword.
    type: Add
  - message: Thief's Agent ID has been moved from the Syndie Kit to the Chameleon
      Kit.
    type: Tweak
  - message: The Syndicate pAI has been removed from the Thief's Syndie Kit.
    type: Remove
  id: 7046
  time: '2024-08-05T08:03:24.0000000+00:00'
  url: space-wizards/space-station-14#30446
- author: EmoGarbage404
  changes:
  - message: Being cold now slows down your character.
    type: Add
  id: 7047
  time: '2024-08-05T08:07:02.0000000+00:00'
  url: space-wizards/space-station-14#29692
- author: EmoGarbage404
  changes:
  - message: The biogenerator has been recolored and renamed to the "biocube fabricator."
    type: Tweak
  id: 7048
  time: '2024-08-06T10:51:33.0000000+00:00'
  url: space-wizards/space-station-14#30696
- author: Errant
  changes:
  - message: Vox can be nukies and ninjas again.
    type: Tweak
  id: 7049
  time: '2024-08-06T10:58:29.0000000+00:00'
  url: space-wizards/space-station-14#29783
- author: slarticodefast
  changes:
  - message: Fixed borgs, animals and aghosts being able to enter cryosleep.
    type: Fix
  id: 7050
  time: '2024-08-06T11:00:15.0000000+00:00'
  url: space-wizards/space-station-14#30574
- author: Flareguy
  changes:
  - message: Most hats are now automatically displaced on vox to look more fitting.
    type: Tweak
  id: 7051
  time: '2024-08-06T13:12:14.0000000+00:00'
  url: space-wizards/space-station-14#30699
- author: Errant
  changes:
  - message: Medical Mask sprite now works on vox.
    type: Fix
  id: 7052
  time: '2024-08-07T03:41:40.0000000+00:00'
  url: space-wizards/space-station-14#30702
- author: Lyroth001
  changes:
  - message: Dragons are immune to flashes
    type: Tweak
  id: 7053
  time: '2024-08-07T07:42:00.0000000+00:00'
  url: space-wizards/space-station-14#30658
- author: ShadowCommander
  changes:
  - message: Rollerbeds can now be dragged to the player to fold and pick them up.
    type: Add
  id: 7054
  time: '2024-08-07T09:19:10.0000000+00:00'
  url: space-wizards/space-station-14#30002
- author: Errant
  changes:
  - message: Survivors arriving via the Unknown Shuttle event, ERT and CBURN agents,
      and Death Squad members are now equipped with the appropriate species-specific
      survival gear.
    type: Fix
  - message: Unknown Shuttle event can once again spawn vox characters.
    type: Tweak
  id: 7055
  time: '2024-08-07T09:26:40.0000000+00:00'
  url: space-wizards/space-station-14#29746
- author: IProduceWidgets
  changes:
  - message: butter is slippery
    type: Tweak
  id: 7056
  time: '2024-08-07T21:47:03.0000000+00:00'
  url: space-wizards/space-station-14#29772
- author: Mervill
  changes:
  - message: Gas Miners now have detailed examine text
    type: Tweak
  id: 7057
  time: '2024-08-08T02:14:31.0000000+00:00'
  url: space-wizards/space-station-14#30480
- author: BackeTako
  changes:
  - message: "!, \u203D and multiple punctuations now work for Spanish."
    type: Tweak
  id: 7058
  time: '2024-08-08T03:08:28.0000000+00:00'
  url: space-wizards/space-station-14#30551
- author: strO0pwafel
  changes:
  - message: Fixed inconsistent naming of CentComm.
    type: Fix
  id: 7059
  time: '2024-08-08T10:04:20.0000000+00:00'
  url: space-wizards/space-station-14#29217
- author: Plykiya
  changes:
  - message: Buffed the range of EMP implants from a radius of 1.75 tiles to 2.75
      tiles.
    type: Tweak
  - message: Buffed the range of EMP grenades from a radius of 4 tiles to 5.5 tiles.
    type: Tweak
  id: 7060
  time: '2024-08-08T10:04:50.0000000+00:00'
  url: space-wizards/space-station-14#30660
- author: Plykiya
  changes:
  - message: You can drop food or drinks from your hands to interrupt eating it, again.
    type: Fix
  - message: Barber scissors are now interrupted if the item is dropped or if the
      user changes hands.
    type: Tweak
  id: 7061
  time: '2024-08-08T11:39:47.0000000+00:00'
  url: space-wizards/space-station-14#30361
- author: TheShuEd
  changes:
  - message: Add "thieving beacon" to Thief antag - a device that counts objects within
      a radius of itself as stolen.
    type: Add
  - message: Return thief structures stealing objectives.
    type: Add
  - message: Animal theft objectives can no longer appear if the animals are not on
      the station.
    type: Fix
  id: 7062
  time: '2024-08-08T13:17:50.0000000+00:00'
  url: space-wizards/space-station-14#29997
- author: lzk228
  changes:
  - message: RD labcoat added in RD's dresser.
    type: Add
  id: 7063
  time: '2024-08-08T22:50:57.0000000+00:00'
  url: space-wizards/space-station-14#30671
- author: SlamBamActionman
  changes:
  - message: Animal DNA now shows up as "unknown DNA" in the Forensic Scanner.
    type: Tweak
  - message: Forensic Scanner can now scan fluid containers for DNA in reagents.
    type: Tweak
  - message: Fluids keep their DNA data when moved.
    type: Fix
  - message: Fluids now stain containers they're in with DNA. Make sure to scrub your
      blood bucket after use!
    type: Add
  - message: Vomit now includes DNA!
    type: Add
  id: 7064
  time: '2024-08-08T23:27:28.0000000+00:00'
  url: space-wizards/space-station-14#26699
- author: themias
  changes:
  - message: Butter can be sliced, cookie and toast recipes now use butter slices.
    type: Tweak
  - message: Chefvend butter reduced from 4 to 3.
    type: Tweak
  id: 7065
  time: '2024-08-08T23:32:42.0000000+00:00'
  url: space-wizards/space-station-14#30789
- author: EmoGarbage404
  changes:
  - message: You should have significantly less friction when moving in space.
    type: Tweak
  id: 7066
  time: '2024-08-09T04:52:25.0000000+00:00'
  url: space-wizards/space-station-14#29383
- author: Plykiya
  changes:
  - message: Hardsuits and EVA suits now count as protection for unscrewing lightbulbs.
    type: Add
  - message: More gloves were given the ability to unscrew light bulbs.
    type: Add
  - message: Behonkers no longer hurt you when melee attacking them or interacting
      with them.
    type: Remove
  id: 7067
  time: '2024-08-09T05:32:41.0000000+00:00'
  url: space-wizards/space-station-14#30244
- author: Ian321
  changes:
  - message: The warden is now an important job.
    type: Tweak
  id: 7068
  time: '2024-08-09T05:45:51.0000000+00:00'
  url: space-wizards/space-station-14#30745
- author: slarticodefast
  changes:
  - message: Added tooltips to the agent ID job icons
    type: Add
  id: 7069
  time: '2024-08-09T06:14:07.0000000+00:00'
  url: space-wizards/space-station-14#28575
- author: stalengd
  changes:
  - message: Head bandana no longer blocks food eating.
    type: Fix
  id: 7070
  time: '2024-08-09T06:17:51.0000000+00:00'
  url: space-wizards/space-station-14#28910
- author: Ubaser
  changes:
  - message: Oxygen and nitrogen canisters now have new sprites when worn.
    type: Add
  id: 7071
  time: '2024-08-09T10:32:55.0000000+00:00'
  url: space-wizards/space-station-14#30809
- author: Plykiya
  changes:
  - message: Buckling someone now triggers a short do-after.
    type: Tweak
  id: 7072
  time: '2024-08-09T15:43:02.0000000+00:00'
  url: space-wizards/space-station-14#29621
- author: Ubaser
  changes:
  - message: Normal crowbars cannot be placed in pockets, but can now fit in belts.
    type: Tweak
  - message: Depending on where you obtained the crowbars, they will now have different
      colours.
    type: Tweak
  id: 7073
  time: '2024-08-09T19:29:00.0000000+00:00'
  url: space-wizards/space-station-14#28988
- author: lzk228
  changes:
  - message: Hotplate works again.
    type: Fix
  id: 7074
  time: '2024-08-10T01:10:39.0000000+00:00'
  url: space-wizards/space-station-14#30830
- author: EmoGarbage404
  changes:
  - message: Maintenance closets have more variety in what they can contain.
    type: Tweak
  id: 7075
  time: '2024-08-10T02:12:40.0000000+00:00'
  url: space-wizards/space-station-14#30579
- author: Ko4erga
  changes:
  - message: Changed chemistry airlock color.
    type: Tweak
  id: 7076
  time: '2024-08-10T03:23:47.0000000+00:00'
  url: space-wizards/space-station-14#30666
- author: Blackern5000
  changes:
  - message: Bent pipes now deal 8 thrown damage instead of 3.
    type: Tweak
  id: 7077
  time: '2024-08-10T03:30:43.0000000+00:00'
  url: space-wizards/space-station-14#30634
- author: shampunj
  changes:
  - message: Rat king can now wideswing
    type: Tweak
  id: 7078
  time: '2024-08-10T12:47:55.0000000+00:00'
  url: space-wizards/space-station-14#30808
- author: BackeTako
  changes:
  - message: Added a suitskirt for the psychologist
    type: Add
  id: 7079
  time: '2024-08-10T12:51:54.0000000+00:00'
  url: space-wizards/space-station-14#30709
- author: Unkn0wnGh0st333
  changes:
  - message: ERT Chaplain starting gear was fixed and will no longer give the ERT
      Engineer gear
    type: Fix
  id: 7080
  time: '2024-08-10T12:55:20.0000000+00:00'
  url: space-wizards/space-station-14#30855
- author: Ubaser
  changes:
  - message: Light tube structures now have new sprites.
    type: Tweak
  id: 7081
  time: '2024-08-10T15:00:22.0000000+00:00'
  url: space-wizards/space-station-14#29091
- author: lzk228
  changes:
  - message: Standartized some clothing recipes.
    type: Tweak
  id: 7082
  time: '2024-08-10T18:16:56.0000000+00:00'
  url: space-wizards/space-station-14#29315
- author: TheShuEd
  changes:
  - message: You cat cut burger bun into two halfs, and make custom burgers now!
    type: Add
  id: 7083
  time: '2024-08-10T19:31:32.0000000+00:00'
  url: space-wizards/space-station-14#30755
- author: thetolbean
  changes:
  - message: Updated Core's boxing ring beacon label to be correct
    type: Tweak
  id: 7084
  time: '2024-08-10T19:50:08.0000000+00:00'
  url: space-wizards/space-station-14#30800
- author: Flareguy
  changes:
  - message: Added vox sprites for most of the remaining common mask items.
    type: Add
  id: 7085
  time: '2024-08-10T21:06:50.0000000+00:00'
  url: space-wizards/space-station-14#30838
- author: Scribbles0, Plykiya, nikthechampiongr
  changes:
  - message: You can now execute incapacitated/cuffed entities or yourself with certain
      sharp weapons. Executions require a do-after, deal 9x the damage of a normal
      attack, and ignore damage resistances.
    type: Add
  id: 7086
  time: '2024-08-11T03:05:54.0000000+00:00'
  url: space-wizards/space-station-14#30104
- author: Plykiya
  changes:
  - message: Cooking shelves have been renamed to Kitchen shelves, you can now put
      more drinks and cutlery in them.
    type: Tweak
  id: 7087
  time: '2024-08-11T06:21:34.0000000+00:00'
  url: space-wizards/space-station-14#30858
- author: BombasterDS
  changes:
  - message: You can now change the suit's sensors on incapacitated people without
      taking it off
    type: Tweak
  id: 7088
  time: '2024-08-11T09:04:43.0000000+00:00'
  url: space-wizards/space-station-14#29668
- author: lzk228
  changes:
  - message: RCD UI can be activated only in hand.
    type: Tweak
  id: 7089
  time: '2024-08-11T09:15:28.0000000+00:00'
  url: space-wizards/space-station-14#30861
- author: TokenStyle
  changes:
  - message: Pax reagent now refresh pacified.
    type: Tweak
  - message: Pax reagent pacified duration has been changed from 2 seconds to 4 seconds.
    type: Tweak
  id: 7090
  time: '2024-08-11T09:19:01.0000000+00:00'
  url: space-wizards/space-station-14#30778
- author: osjarw
  changes:
  - message: You can once again pull and buckle pets.
    type: Fix
  id: 7091
  time: '2024-08-11T09:22:46.0000000+00:00'
  url: space-wizards/space-station-14#30066
- author: slarticodefast
  changes:
  - message: The sentient plant mutation can no longer be propagated to other trays
      via seeds or swabs. It has also been made more rare.
    type: Tweak
  id: 7092
  time: '2024-08-11T09:23:14.0000000+00:00'
  url: space-wizards/space-station-14#29133
- author: Moomoobeef
  changes:
  - message: Added The Throngler (Plushie) to the grand lottery!!
    type: Add
  id: 7093
  time: '2024-08-11T10:26:37.0000000+00:00'
  url: space-wizards/space-station-14#29978
- author: Plykiya
  changes:
  - message: Energy sword weapons are now execution-capable.
    type: Add
  id: 7094
  time: '2024-08-11T22:12:31.0000000+00:00'
  url: space-wizards/space-station-14#30909
- author: Blackern5000
  changes:
  - message: Added diamond-tipped mining drills, a science printed item found under
      T2 industrial.
    type: Add
  - message: Standard mining drills now attack faster and break rocks in two hits.
    type: Tweak
  - message: Moved ore bags of holding to T2 industrial tech.
    type: Tweak
  - message: Grappling guns are now researched with Salvage Equipment.
    type: Tweak
  - message: Diamonds are now worth 2,000 spesos each.
    type: Tweak
  id: 7095
  time: '2024-08-12T01:49:09.0000000+00:00'
  url: space-wizards/space-station-14#30814
- author: mirrorcult
  changes:
  - message: With space law being overhauled, you can now examine items to see their
      contraband status, and whether with your current access you'd be accosted by
      Security for owning it. This will also clearly show non-stealth syndicate items.
    type: Add
  id: 7096
  time: '2024-08-12T03:57:50.0000000+00:00'
  url: space-wizards/space-station-14#28688
- author: DieselMohawk
  changes:
  - message: Resprited Security vest and helmet
    type: Tweak
  id: 7097
  time: '2024-08-12T06:20:56.0000000+00:00'
  url: space-wizards/space-station-14#30291
- author: Ubaser
  changes:
  - message: Mantles are now available in loadouts, requiring 20 hours of that head
      of department's time.
    type: Add
  - message: Mantles are no longer spawned in dressers or able to be printed at uniform
      lathes.
    type: Remove
  id: 7098
  time: '2024-08-12T07:14:46.0000000+00:00'
  url: space-wizards/space-station-14#30929
```



</details>


**Проверки**
<!-- Выполнение всех следующих действий, если это приемлемо для вида
изменений сильно ускорит разбор вашего PR -->
- [ ] PR полностью завершён и мне не нужна помощь чтобы его закончить.
- [ ] Я внимательно просмотрел все свои изменения и багов в них не
нашёл.
- [ ] Я запускал локальный сервер со своими изменениями и всё
протестировал.
- [ ] Я добавил скриншот/видео демонстрации PR в игре, **или** этот PR
этого не требует.

**Изменения**
<!--
Здесь вы можете написать список изменений, который будет автоматически
добавлен в игру, когда ваш PR будет принят.

В журнал изменений следует помещать только то, что действительно важно
игрокам.

В списке изменений тип значка не является часть предложения, поэтому
явно указывайте - Добавлен, Удалён, Изменён.
плохо: - add: Новый инструмент для инженеров
хорошо: - add: Добавлен новый инструмент для инженеров

Вы можете указать своё имя после символа 🆑 именно оно будет
отображаться в журнале изменений (иначе будет использоваться ваше имя на
GitHub)
Например: 🆑 Ian

-->

🆑 Шрёдька
- tweak: Подтянул коммиты с Корвакса, 13.08.24.

---------

Co-authored-by: Emisse <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: NakataRin <[email protected]>
Co-authored-by: Nemanja <[email protected]>
Co-authored-by: Errant <[email protected]>
Co-authored-by: PJBot <[email protected]>
Co-authored-by: Brandon Hu <[email protected]>
Co-authored-by: Lye <[email protected]>
Co-authored-by: ShadowCommander <[email protected]>
Co-authored-by: Ko4ergaPunk <[email protected]>
Co-authored-by: lzk <[email protected]>
Co-authored-by: IProduceWidgets <[email protected]>
Co-authored-by: Morb0 <[email protected]>
Co-authored-by: Mr. 27 <[email protected]>
Co-authored-by: Mervill <[email protected]>
Co-authored-by: TakoDragon <[email protected]>
Co-authored-by: deltanedas <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: Ed <[email protected]>
Co-authored-by: strO0pwafel <[email protected]>
Co-authored-by: stroopwafel <[email protected]>
Co-authored-by: Plykiya <[email protected]>
Co-authored-by: plykiya <[email protected]>
Co-authored-by: Vigers Ray <[email protected]>
Co-authored-by: saintmuntzer <[email protected]>
Co-authored-by: dffdff2423 <[email protected]>
Co-authored-by: SlamBamActionman <[email protected]>
Co-authored-by: Flareguy <[email protected]>
Co-authored-by: themias <[email protected]>
Co-authored-by: beck-thompson <[email protected]>
Co-authored-by: slarticodefast <[email protected]>
Co-authored-by: nikthechampiongr <[email protected]>
Co-authored-by: Ian <[email protected]>
Co-authored-by: Repo <[email protected]>
Co-authored-by: Psychpsyo <[email protected]>
Co-authored-by: CaasGit <[email protected]>
Co-authored-by: Thomas <[email protected]>
Co-authored-by: Simon <[email protected]>
Co-authored-by: Stalen <[email protected]>
Co-authored-by: TsjipTsjip <[email protected]>
Co-authored-by: Chief-Engineer <[email protected]>
Co-authored-by: Ilya246 <[email protected]>
Co-authored-by: eoineoineoin <[email protected]>
Co-authored-by: Eoin Mcloughlin <[email protected]>
Co-authored-by: Ubaser <[email protected]>
Co-authored-by: MureixloI <[email protected]>
Co-authored-by: Vasilis <[email protected]>
Co-authored-by: NotSoDamn <[email protected]>
Co-authored-by: Настя <[email protected]>
Co-authored-by: DrSmugleaf <[email protected]>
Co-authored-by: Alzore <[email protected]>
Co-authored-by: deathride58 <[email protected]>
Co-authored-by: Unkn0wn_Gh0st <[email protected]>
Co-authored-by: shamp <[email protected]>
Co-authored-by: MerrytheManokit <[email protected]>
Co-authored-by: Kukutis96513 <[email protected]>
Co-authored-by: Hrosts <[email protected]>
Co-authored-by: Preston Smith <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Scribbles0 <[email protected]>
Co-authored-by: BombasterDS <[email protected]>
Co-authored-by: blueDev2 <[email protected]>
Co-authored-by: Token <[email protected]>
Co-authored-by: osjarw <[email protected]>
Co-authored-by: Moomoobeef <[email protected]>
Co-authored-by: mhamster <[email protected]>
Co-authored-by: Killerqu00 <[email protected]>
Co-authored-by: TiFeRi <[email protected]>
Co-authored-by: Zachary Yona <[email protected]>
Co-authored-by: Zachary Yona <[email protected]>
Co-authored-by: Kara <[email protected]>
Co-authored-by: EmoGarbage404 <[email protected]>
Co-authored-by: DieselMohawk <[email protected]>
Co-authored-by: lapatison <[email protected]>
Co-authored-by: KashRas2 <[email protected]>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: PyotrIgn <[email protected]>
Co-authored-by: PyotrIgn <[email protected]>
Co-authored-by: FaDeOkno <[email protected]>
Co-authored-by: KashRas2 <[email protected]>
Co-authored-by: Eugeny <[email protected]>
Co-authored-by: FaDeOkno <[email protected]>
  • Loading branch information
@Schrodinger71 @Emisse
@metalgearsloth @ElectroJr @NakataRin @EmoGarbage404 @Errant-4 @PJBot @Brandon-Huu @Lyroth001 @ShadowCommander @Ko4ergaPunk @lzk228 @IProduceWidgets @Morb0 @Dutch-VanDerLinde @Mervill @BackeTako @deltanedas @TheShuEd @strO0pwafel @Plykiya @VigersRay @saintmuntzer @dffdff2423 @SlamBamActionman @Flareguy @themias @beck-thompson @slarticodefast @nikthechampiongr @Ian321 @Titian3 @Psychpsyo @CaasGit @Aeshus @Simyon264 @stalengd @TsjipTsjip @Chief-Engineer @Ilya246 @eoineoineoin @UbaserB @MureixloI @VasilisThePikachu @NotSoDana @meowstushka @DrSmugleaf @Blackern5000 @deathride58 @Unkn0wnGh0st333 @shampunj @MerrytheManokit @SpaceLizardSky @Hrosts @thetolbean @github-actions @Scribbles0 @blueDev2 @TokenStyle @osjarw @Moomoobeef @mhamsterr @Killerqu00 @XsenonDash @Magicalus @mirrorcult @DieselMohawk @lapatison @KashRas2 @PyotrIgn @FaDeOkno @KashRas
84 people authored Aug 23, 2024
1 parent 4af6de0 commit f17f2b1
Show file tree
Hide file tree
Showing 1,584 changed files with 175,087 additions and 154,199 deletions.
4 changes: 2 additions & 2 deletions Content.Client/Access/UI/AgentIDCardBoundUserInterface.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ private void OnJobChanged(string newJob)
SendMessage(new AgentIDCardJobChangedMessage(newJob));
}

public void OnJobIconChanged(ProtoId<StatusIconPrototype> newJobIconId)
public void OnJobIconChanged(ProtoId<JobIconPrototype> newJobIconId)
{
SendMessage(new AgentIDCardJobIconChangedMessage(newJobIconId));
}
Expand All @@ -55,7 +55,7 @@ protected override void UpdateState(BoundUserInterfaceState state)

_window.SetCurrentName(cast.CurrentName);
_window.SetCurrentJob(cast.CurrentJob);
_window.SetAllowedIcons(cast.Icons, cast.CurrentJobIconId);
_window.SetAllowedIcons(cast.CurrentJobIconId);
}
}
}
11 changes: 4 additions & 7 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,9 @@
<LineEdit Name="NameLineEdit" />
<Label Name="CurrentJob" Text="{Loc 'agent-id-card-current-job'}" />
<LineEdit Name="JobLineEdit" />
<BoxContainer Orientation="Horizontal">
<Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
<Control HorizontalExpand="True" MinSize="50 0"/>
<GridContainer Name="IconGrid" Columns="10">
<!-- Job icon buttons are generated in the code -->
</GridContainer>
</BoxContainer>
<Label Text="{Loc 'agent-id-card-job-icon-label'}"/>
<GridContainer Name="IconGrid" Columns="10">
<!-- Job icon buttons are generated in the code -->
</GridContainer>
</BoxContainer>
</DefaultWindow>
22 changes: 10 additions & 12 deletions Content.Client/Access/UI/AgentIDCardWindow.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Prototypes;
using System.Numerics;
using System.Linq;

namespace Content.Client.Access.UI
{
Expand All @@ -23,7 +24,7 @@ public sealed partial class AgentIDCardWindow : DefaultWindow
public event Action<string>? OnNameChanged;
public event Action<string>? OnJobChanged;

public event Action<ProtoId<StatusIconPrototype>>? OnJobIconChanged;
public event Action<ProtoId<JobIconPrototype>>? OnJobIconChanged;

public AgentIDCardWindow()
{
Expand All @@ -38,17 +39,16 @@ public AgentIDCardWindow()
JobLineEdit.OnFocusExit += e => OnJobChanged?.Invoke(e.Text);
}

public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string currentJobIconId)
public void SetAllowedIcons(string currentJobIconId)
{
IconGrid.DisposeAllChildren();

var jobIconGroup = new ButtonGroup();
var jobIconButtonGroup = new ButtonGroup();
var i = 0;
foreach (var jobIconId in icons)
var icons = _prototypeManager.EnumeratePrototypes<JobIconPrototype>().Where(icon => icon.AllowSelection).ToList();
icons.Sort((x, y) => string.Compare(x.LocalizedJobName, y.LocalizedJobName, StringComparison.CurrentCulture));
foreach (var jobIcon in icons)
{
if (!_prototypeManager.TryIndex(jobIconId, out var jobIcon))
continue;

String styleBase = StyleBase.ButtonOpenBoth;
var modulo = i % JobIconColumnCount;
if (modulo == 0)
Expand All @@ -62,8 +62,9 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
Access = AccessLevel.Public,
StyleClasses = { styleBase },
MaxSize = new Vector2(42, 28),
Group = jobIconGroup,
Pressed = i == 0,
Group = jobIconButtonGroup,
Pressed = currentJobIconId == jobIcon.ID,
ToolTip = jobIcon.LocalizedJobName
};

// Generate buttons textures
Expand All @@ -78,9 +79,6 @@ public void SetAllowedIcons(HashSet<ProtoId<StatusIconPrototype>> icons, string
jobIconButton.OnPressed += _ => OnJobIconChanged?.Invoke(jobIcon.ID);
IconGrid.AddChild(jobIconButton);

if (jobIconId.Equals(currentJobIconId))
jobIconButton.Pressed = true;

i++;
}
}
Expand Down
15 changes: 14 additions & 1 deletion Content.Client/Actions/ActionsSystem.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ public override void Initialize()
SubscribeLocalEvent<InstantActionComponent, ComponentHandleState>(OnInstantHandleState);
SubscribeLocalEvent<EntityTargetActionComponent, ComponentHandleState>(OnEntityTargetHandleState);
SubscribeLocalEvent<WorldTargetActionComponent, ComponentHandleState>(OnWorldTargetHandleState);
SubscribeLocalEvent<EntityWorldTargetActionComponent, ComponentHandleState>(OnEntityWorldTargetHandleState);
}

private void OnInstantHandleState(EntityUid uid, InstantActionComponent component, ref ComponentHandleState args)
Expand Down Expand Up @@ -76,6 +77,18 @@ private void OnWorldTargetHandleState(EntityUid uid, WorldTargetActionComponent
BaseHandleState<WorldTargetActionComponent>(uid, component, state);
}

private void OnEntityWorldTargetHandleState(EntityUid uid,
EntityWorldTargetActionComponent component,
ref ComponentHandleState args)
{
if (args.Current is not EntityWorldTargetActionComponentState state)
return;

component.Whitelist = state.Whitelist;
component.CanTargetSelf = state.CanTargetSelf;
BaseHandleState<EntityWorldTargetActionComponent>(uid, component, state);
}

private void BaseHandleState<T>(EntityUid uid, BaseActionComponent component, BaseActionComponentState state) where T : BaseActionComponent
{
// TODO ACTIONS use auto comp states
Expand Down Expand Up @@ -293,7 +306,7 @@ public void LoadActionAssignments(string path, bool userData)
continue;

var action = _serialization.Read<BaseActionComponent>(actionNode, notNullableOverride: true);
var actionId = Spawn(null);
var actionId = Spawn();
AddComp(actionId, action);
AddActionDirect(user, actionId);

Expand Down
2 changes: 1 addition & 1 deletion Content.Client/Administration/AdminNameOverlay.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ protected override void Draw(in OverlayDrawArgs args)
}

// if not on the same map, continue
if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != _eyeManager.CurrentMap)
if (_entityManager.GetComponent<TransformComponent>(entity.Value).MapID != args.MapId)
{
continue;
}
Expand Down
9 changes: 7 additions & 2 deletions Content.Client/Administration/UI/Bwoink/BwoinkControl.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,18 @@ public BwoinkControl()
if (a.IsPinned != b.IsPinned)
return a.IsPinned ? -1 : 1;

// First, sort by unread. Any chat with unread messages appears first. We just sort based on unread
// status, not number of unread messages, so that more recent unread messages take priority.
// First, sort by unread. Any chat with unread messages appears first.
var aUnread = ach.Unread > 0;
var bUnread = bch.Unread > 0;
if (aUnread != bUnread)
return aUnread ? -1 : 1;

// Sort by recent messages during the current round.
var aRecent = a.ActiveThisRound && ach.LastMessage != DateTime.MinValue;
var bRecent = b.ActiveThisRound && bch.LastMessage != DateTime.MinValue;
if (aRecent != bRecent)
return aRecent ? -1 : 1;

// Next, sort by connection status. Any disconnected players are grouped towards the end.
if (a.Connected != b.Connected)
return a.Connected ? -1 : 1;
Expand Down
36 changes: 36 additions & 0 deletions Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<ui:FancyWindow
xmlns="https://spacestation14.io"
xmlns:controls="clr-namespace:Content.Client.UserInterface.Controls"
xmlns:ui="clr-namespace:Content.Client.UserInterface.Controls"
Title="{Loc ban-panel-title}" MinSize="300 300">
<BoxContainer Orientation="Vertical">
<BoxContainer Orientation="Horizontal">
<Label Name="PlayerName"/>
<Button Name="UsernameCopyButton" Text="{Loc player-panel-copy-username}"/>
</BoxContainer>
<BoxContainer Orientation="Horizontal">
<Label Name="Whitelisted"/>
<controls:ConfirmButton Name="WhitelistToggle" Text="{Loc 'player-panel-false'}" Visible="False"></controls:ConfirmButton>
</BoxContainer>
<Label Name="Playtime"/>
<Label Name="Notes"/>
<Label Name="Bans"/>
<Label Name="RoleBans"/>
<Label Name="SharedConnections"/>

<BoxContainer Align="Center">
<GridContainer Rows="5">
<Button Name="NotesButton" Text="{Loc player-panel-show-notes}" SetWidth="136" Disabled="True"/>
<Button Name="AhelpButton" Text="{Loc player-panel-help}" Disabled="True"/>
<Button Name="FreezeButton" Text = "{Loc player-panel-freeze}" Disabled="True"/>
<controls:ConfirmButton Name="KickButton" Text="{Loc player-panel-kick}" Disabled="True"/>
<controls:ConfirmButton Name="DeleteButton" Text="{Loc player-panel-delete}" Disabled="True"/>
<Button Name="ShowBansButton" Text="{Loc player-panel-show-bans}" SetWidth="136" Disabled="True"/>
<Button Name="LogsButton" Text="{Loc player-panel-logs}" Disabled="True"/>
<Button Name="FreezeAndMuteToggleButton" Text="{Loc player-panel-freeze-and-mute}" Disabled="True"/>
<Button Name="BanButton" Text="{Loc player-panel-ban}" Disabled="True"/>
<controls:ConfirmButton Name="RejuvenateButton" Text="{Loc player-panel-rejuvenate}" Disabled="True"/>
</GridContainer>
</BoxContainer>
</BoxContainer>
</ui:FancyWindow>
132 changes: 132 additions & 0 deletions Content.Client/Administration/UI/PlayerPanel/PlayerPanel.xaml.cs
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
using Content.Client.Administration.Managers;
using Content.Client.UserInterface.Controls;
using Content.Shared.Administration;
using Robust.Client.AutoGenerated;
using Robust.Client.UserInterface;
using Robust.Client.UserInterface.XAML;
using Robust.Shared.Network;
using Robust.Shared.Utility;

namespace Content.Client.Administration.UI.PlayerPanel;

[GenerateTypedNameReferences]
public sealed partial class PlayerPanel : FancyWindow
{
private readonly IClientAdminManager _adminManager;

public event Action<string>? OnUsernameCopy;
public event Action<NetUserId?>? OnOpenNotes;
public event Action<NetUserId?>? OnOpenBans;
public event Action<NetUserId?>? OnAhelp;
public event Action<string?>? OnKick;
public event Action<NetUserId?>? OnOpenBanPanel;
public event Action<NetUserId?, bool>? OnWhitelistToggle;
public event Action? OnFreezeAndMuteToggle;
public event Action? OnFreeze;
public event Action? OnLogs;
public event Action? OnDelete;
public event Action? OnRejuvenate;

public NetUserId? TargetPlayer;
public string? TargetUsername;
private bool _isWhitelisted;

public PlayerPanel(IClientAdminManager adminManager)
{
RobustXamlLoader.Load(this);
_adminManager = adminManager;

UsernameCopyButton.OnPressed += _ => OnUsernameCopy?.Invoke(PlayerName.Text ?? "");
BanButton.OnPressed += _ => OnOpenBanPanel?.Invoke(TargetPlayer);
KickButton.OnPressed += _ => OnKick?.Invoke(TargetUsername);
NotesButton.OnPressed += _ => OnOpenNotes?.Invoke(TargetPlayer);
ShowBansButton.OnPressed += _ => OnOpenBans?.Invoke(TargetPlayer);
AhelpButton.OnPressed += _ => OnAhelp?.Invoke(TargetPlayer);
WhitelistToggle.OnPressed += _ =>
{
OnWhitelistToggle?.Invoke(TargetPlayer, _isWhitelisted);
SetWhitelisted(!_isWhitelisted);
};
FreezeButton.OnPressed += _ => OnFreeze?.Invoke();
FreezeAndMuteToggleButton.OnPressed += _ => OnFreezeAndMuteToggle?.Invoke();
LogsButton.OnPressed += _ => OnLogs?.Invoke();
DeleteButton.OnPressed += _ => OnDelete?.Invoke();
RejuvenateButton.OnPressed += _ => OnRejuvenate?.Invoke();
}

public void SetUsername(string player)
{
Title = Loc.GetString("player-panel-title", ("player", player));
PlayerName.Text = Loc.GetString("player-panel-username", ("player", player));
}

public void SetWhitelisted(bool? whitelisted)
{
if (whitelisted == null)
{
Whitelisted.Text = null;
WhitelistToggle.Visible = false;
}
else
{
Whitelisted.Text = Loc.GetString("player-panel-whitelisted");
WhitelistToggle.Text = whitelisted.Value.ToString();
WhitelistToggle.Visible = true;
_isWhitelisted = whitelisted.Value;
}
}

public void SetBans(int? totalBans, int? totalRoleBans)
{
// If one value exists then so should the other.
DebugTools.Assert(totalBans.HasValue && totalRoleBans.HasValue || totalBans == null && totalRoleBans == null);

Bans.Text = totalBans != null ? Loc.GetString("player-panel-bans", ("totalBans", totalBans)) : null;

RoleBans.Text = totalRoleBans != null ? Loc.GetString("player-panel-rolebans", ("totalRoleBans", totalRoleBans)) : null;
}

public void SetNotes(int? totalNotes)
{
Notes.Text = totalNotes != null ? Loc.GetString("player-panel-notes", ("totalNotes", totalNotes)) : null;
}

public void SetSharedConnections(int sharedConnections)
{
SharedConnections.Text = Loc.GetString("player-panel-shared-connections", ("sharedConnections", sharedConnections));
}

public void SetPlaytime(TimeSpan playtime)
{
Playtime.Text = Loc.GetString("player-panel-playtime",
("days", playtime.Days),
("hours", playtime.Hours % 24),
("minutes", playtime.Minutes % (24 * 60)));
}

public void SetFrozen(bool canFreeze, bool frozen)
{
FreezeAndMuteToggleButton.Disabled = !canFreeze;
FreezeButton.Disabled = !canFreeze || frozen;

FreezeAndMuteToggleButton.Text = Loc.GetString(!frozen ? "player-panel-freeze-and-mute" : "player-panel-unfreeze");
}

public void SetAhelp(bool canAhelp)
{
AhelpButton.Disabled = !canAhelp;
}

public void SetButtons()
{
BanButton.Disabled = !_adminManager.CanCommand("banpanel");
KickButton.Disabled = !_adminManager.CanCommand("kick");
NotesButton.Disabled = !_adminManager.CanCommand("adminnotes");
ShowBansButton.Disabled = !_adminManager.CanCommand("banlist");
WhitelistToggle.Disabled =
!(_adminManager.CanCommand("addwhitelist") && _adminManager.CanCommand("removewhitelist"));
LogsButton.Disabled = !_adminManager.CanCommand("adminlogs");
RejuvenateButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
DeleteButton.Disabled = !_adminManager.HasFlag(AdminFlags.Debug);
}
}
Loading

0 comments on commit f17f2b1

Please sign in to comment.