Dmitry
7244f00e83
merge remote wizden/master
2026-10-05 18:57:03 +07:00
Whatstone
838aecdccc
Allow secondary/tertiary config atmos entities to be copied in the map editor ( #45950 )
...
Add SandboxCopyableComponent
2026-10-05 01:41:31 +00:00
Dmitry
73ffef2ac0
merge remote wizden/master
2026-09-17 23:33:06 +07:00
Princess Cheeseballs
2c6ffecf62
Move GameTicker to Shared ( #45834 )
...
* Scope creep my ass
* why was this shit not pushed????
* gone...
* fix that
* review plus buildd
* asfsafsafsafsafas
* grug
* burber
* I'll fix this later
* shrimply die
* also this
* it's snerf or snuthin
* assaads
* round snend
* aaaa
* fix this shit for real
* actually, don't start GameRules until MapInit now that I think aboot it.
* forgot u
* don't actually need this part nullable
* Deffer comp removal
* one liner
* do that too
* chungus
* Honestly makes more sense here, plus WHY are we doing all that shit on "GameRuleAdded" rather than GameRuleStarted(?)
* deferred removal :V
* aaaaaaaaaaaaaaa
* whhop
* Whoop
* better
* landmine that I placed for myself then forgot about lmao
* cleanup
* FUCKING `!`
* gotovo
* amogus
* please don't check by metadata I beg
* waawsasfdfsasfa
* sfafsasfafsas
* fdsaasffsasfa
* code
* fix
* fasasffasfasfsad
* chungaas
* I may be stupid
* gra
* graaaaaaaaaaaaaaaaa
* comment
* gra
* clearing is not predicted and would require major refactors, so don't cache on client.
* lame shit :P
* last holes
* nukeopsfsafsasafsfafsa
* why was that shit public bruh
* bubrbgwahrghfaka
* dynamic
* revert change that did nothing lmao
2026-09-16 19:34:19 +00:00
Pok
943d1af8a5
[Wiki] Обновление ботов ( #3719 )
2026-09-04 03:09:31 +07:00
Dmitry
f29b823c79
merge remote wizden/master
2026-06-29 15:09:19 +07:00
AndrewFenriz
5c24cb0de7
Refactor RecipeManager to use LINQ and PrototypesReloaded ( #49 )
...
* small refactor RecipeManager and fix prototype reloading
* wait... why is that here?
* maybe?
2026-06-21 04:42:02 +00:00
InsoPL
a79f85248b
Directional arrow ( #118 )
...
* arrow
* yoink orginal arrow rsi
* done
* fixes
* i just learnd about ignored components
* Update Content.Client/DirectionalArrowIndicator/DirectionalArrowIndicatorComponent.cs
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
* customArrows
* docs
* more docs
* teg and blue arrow
* misc
* fixes
* remove color
* imma dummy
* meta
* soon to obsolete
* class not partial
---------
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
2026-06-20 21:45:43 +00:00
Dmitry
d77fb7b4cc
merge origin/master
2026-05-25 05:35:37 +07:00
Dmitry
fb7486dcb7
merge remote wizden/master
2026-05-19 18:43:37 +07:00
Pok
eae145c40b
[Wiki] JsonGenerator fix ( #3593 )
2026-05-12 18:38:50 +07:00
Pieter-Jan Briers
5168b5f3d4
IoC source gen compatibility ( #43863 )
...
* IoC source gen compatibility
Can be merged before or after https://github.com/space-wizards/RobustToolbox/pull/6549 doesn't really matter.
* Missed a spot
2026-05-09 03:29:58 +00:00
Pok
95c2be9fe2
[Wiki] Способности ( #3553 )
2026-04-07 10:16:01 +07:00
Pok
8e683a9257
[Wiki] авто загрузка спрайтов ( #3541 )
2026-03-29 04:51:22 +07:00
Dmitry
d795bad2e9
merge origin/master
2026-03-23 05:29:21 +07:00
Pok
a547342d19
[Wiki] пометка страниц дубликатов ( #3537 )
2026-03-18 23:52:46 +07:00
Pok
9b06d3f761
[Wiki] fix update-wiki (part 99) ( #3525 )
2026-03-09 22:42:57 +07:00
Dmitry
49644d5a25
merge origin/master
2026-03-08 03:22:17 +07:00
Pok
736021ac25
[Wiki] генерация страниц сущностей ( #3523 )
2026-03-08 03:17:13 +07:00
Dmitry
1a975ebdbe
merge remote wizden/stable
2026-03-07 03:16:30 +07:00
Moony
04b4b7d51c
Non-obsoletion warnings as errors in Release. ( #42983 )
...
* Non-obsoletion warnings as errors in Release.
* Add two other obsoletions related to collection expressions.
These are not present in the codebase, but may become so in the future.
* Exempt NU1903 so the project can't mysteriously stop building.
* Fix some FULL_RELEASE mistakes.
* diff fix
* Resharper caught this one. Note to self: Wire up resharper to CI in another PR.
2026-02-23 21:07:22 +00:00
Dmitry
7c3915f9cf
merge remote wizden/master
2026-01-29 00:01:34 +07:00
Pieter-Jan Briers
1682ad243f
Update RT to 271.2.0 ( #42646 )
2026-01-25 19:09:24 +00:00
Dmitry
d7704cb9cb
merge remote wizden/master
2026-01-24 00:55:41 +07:00
Julian Giebel
bcd3612730
Add feedback popups ( #41352 )
...
* Commit
* add the form post
* dv
* fixes
* Change wording
* Address review
* wording change
* Added some stuff
* New format
* bruh
* thanks perry!
* yes
* More fixes!
* typo
* Add a command to show the list, improve the UI slightly, split up command names
* Fix UI controller
* Add better comment
* Get rid of weird recursive thing
* Cleanup
* Work on moving feedback popups out of simulation
* Move round end screen subscription to feedback ui controller
* Finish moving feedback popups out of simulation
* Fix _ as parameter
* Clean up FeedbackPopupUIController
* Clean up commands
* Fix prototype yaml
* Fix openfeedbackpopup command description
* Update Resources/Locale/en-US/feedbackpopup/feedbackpopup.ftl
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
* Address reviews
* Address reviews
* Fix FeedbackPopupPrototype.cs using empty string instead of string.empty
* Address some more of the reviews, style nano is still trolling sadly
* Fix feedback popup styling
* Fix PopupPrototype ID field not having a setter
* Address reviews
* Add label when no feedback entries are present
Change link button to not show when no link is set
---------
Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
Co-authored-by: Simon <63975668+Simyon264@users.noreply.github.com>
2026-01-22 22:19:54 +00:00
Pok
b462533f82
[Wiki] Подгрузка ВСЕГО на вики ( #3487 )
2026-01-20 03:28:44 +07:00
Pok
1cc0f83350
[Wiki] Подгрузка всех ключей локализации ( #3482 )
2026-01-14 12:55:26 +07:00
Dmitry
7461f7e638
codefix
2025-10-05 04:14:59 +07:00
Dmitry
76e987c7b3
merge mini-upstream
2025-10-05 03:20:56 +07:00
Leon Friedrich
de9593c0e7
Remove static IoC from client & server EntryPoint ( #40562 )
...
* Remove static IoC from client & server EntryPoint
* Fix missing log manager initialization
* file namespace
2025-10-02 14:32:56 +00:00
Dmitry
f01a60f5c7
upstream 9.1
2025-09-17 06:41:33 +07:00
Quantum-cross
52c903cab8
Dynamic anomaly scanner texture ( #37585 )
2025-09-04 22:11:03 +03:00
Fildrance
60ea135fd3
Revert "Added button and manager for in game bug reports (Part 1)" ( #39872 )
...
Revert "Added button and manager for in game bug reports (Part 1) (#35350 )"
This reverts commit a8d6dbc324
2025-08-28 01:46:24 -07:00
beck-thompson
a8d6dbc324
Added button and manager for in game bug reports (Part 1) ( #35350 )
...
* Added the button and manager
* Minor cleanup
* Reigstered to the wrong thing!
* Unload UI
* Address the review
* First commit :)
* Some cleanup
* Added some comments and now the placehoder text goes away once you start typing
* Some cleanup and better test command
* Basic rate limiter class (Not finished)
* Cleanup
* Removed forgotten comment xD
* Whitespace removal
* Minor cleanup, cvar hours -> minutes
* More minor tweaks
* Don't cache timer and add examples to fields
* Added CCvar for time between bug reports
* Minor crash when restarting rounds fixed
* It compiled on my computer!
* Fix comment indents
* Remove unecessary async, removed magic strings, simplfied sawmill to not use post inject
* Make struct private
* Simplfiy TryGetLongHeader
* Changed list to enumerable
* URI cleanup
* Got rid of the queue, used a much better way!
* Made the comments a little better and fix some issues with them
* Added header consts
* Maximum reports per round is now an error message
* Time between reports is now in seconds
* Change ordering
* Change hotkey to O
* only update window when its open
* Split up validation
* address review
* Address a few issues
* inheritance fix
* API now doesn't keep track of requests, just uses the rate limited response from github
* Rough idea of how channels would work
* refactor: reorganized code, placed rate limiter into http-client-handler AND manager (usually only manager-one should work)
* cleanup
* Add user agent so api doesn't get mad
* Better error logs
* Cleanup
* It now throws!
* refactor: renaming, moved some methods, xml-doc cleanups
* refactor: BugReportWindow formatted to convention, enforced 1 updates only 1 per sec
* Add very basic licence info
* Fixed the issues!
* Set ccvar default to false
* make the button better
* fix test fail silly me
* Adress the review!
* refactor: cleanup of entry point code, binding server-side code with client-facing manager
* Resolve the other issues and cleanup and stuff smile :)
* not entity
* fixes
* Cleanup
* Cleanup
* forgor region
* fixes
* Split up function and more stuff
* Better unsubs yaygit add -A
* I pray...
* Revert "I pray..."
This reverts commit 9629fb4f1289c9009a03e4e4facd9ae975e6303e.
* I think I have to add it in the pr
* Revert "I think I have to add it in the pr"
This reverts commit e185b42f570fe5f0f51e0e44761d7938e22e67f7.
* Tweaks
* Minor tweak to permissions
---------
Co-authored-by: pa.pecherskij <pa.pecherskij@interfax.ru>
2025-08-15 09:10:38 -07:00
Dmitry
0f4b1717e0
upstream
2025-06-08 00:04:48 +07:00
BarryNorfolk
b2d0f7ed28
Add multipart machines system ( #35969 )
2025-06-02 17:02:41 +03:00
Simon
7867cbec00
Add basic discord client integration with ooc and admin chat support ( #33840 )
...
* Add basic discord client integration with ooc and admin chat support
* Use username instead of global name
WHY IS GLOBAL NAME NOT JUST THE USERNAME??? WHY ARE THERE NO DOC COMMENTS???
* stuff
* Reviews, methinks.
* Reviews
* reviews
2025-05-24 20:49:52 +02:00
Dmitry
25c5e59248
Upstream ( #3172 )
...
Signed-off-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: Samuka-C <47865393+Samuka-C@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: Partmedia <kevinz5000@gmail.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: themias <89101928+themias@users.noreply.github.com>
Co-authored-by: Victor Shen <71985089+Vexerot@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Milon <milonpl.git@proton.me>
Co-authored-by: Kirus59 <145689588+Kirus59@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Stomf <5dorkydorks@gmail.com>
Co-authored-by: drakewill-CRL <46307022+drakewill-CRL@users.noreply.github.com>
Co-authored-by: PraxisMapper <praxismapper@gmail.com>
Co-authored-by: EmoGarbage404 <retron404@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
Co-authored-by: IProduceWidgets <107586145+IProduceWidgets@users.noreply.github.com>
Co-authored-by: TytosB <54259736+TytosB@users.noreply.github.com>
Co-authored-by: abadaba695 <spacestation13thingy@gmail.com>
Co-authored-by: kosticia <kosticia46@gmail.com>
Co-authored-by: Thinbug <101073555+Thinbug0@users.noreply.github.com>
Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: SlamBamActionman <83650252+SlamBamActionman@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: ActiveMammmoth <140334666+ActiveMammmoth@users.noreply.github.com>
Co-authored-by: Myra <vasilis@pikachu.systems>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Co-authored-by: K-Dynamic <20566341+K-Dynamic@users.noreply.github.com>
Co-authored-by: Gentleman-Bird <dcgreen406@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: BIGZi0348 <svalker0348@gmail.com>
Co-authored-by: LaCumbiaDelCoronavirus <90893484+LaCumbiaDelCoronavirus@users.noreply.github.com>
Co-authored-by: imatsoup <93290208+imatsoup@users.noreply.github.com>
Co-authored-by: Matthew Herber <32679887+happyrobot33@users.noreply.github.com>
Co-authored-by: Ertanic <36124833+Ertanic@users.noreply.github.com>
Co-authored-by: MissKay1994 <15877268+MissKay1994@users.noreply.github.com>
Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: eoineoineoin <helloworld@eoinrul.es>
Co-authored-by: Tiniest Shark <head.rebel@yahoo.com>
Co-authored-by: nikitosych <boriszyn@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Perry Fraser <perryprog@users.noreply.github.com>
Co-authored-by: YoungThug <ramialanbagy@gmail.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Southbridge <7013162+southbridge-fur@users.noreply.github.com>
Co-authored-by: Vladislav Suchkov <20380250+murolem@users.noreply.github.com>
Co-authored-by: Prole <172158352+Prole0@users.noreply.github.com>
Co-authored-by: Unkn0wn_Gh0st <shadowstalkermll@gmail.com>
Co-authored-by: 3nderall <101940324+3nderall@users.noreply.github.com>
Co-authored-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: J <billsmith116@gmail.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: chromiumboy <50505512+chromiumboy@users.noreply.github.com>
Co-authored-by: youtissoum <51883137+youtissoum@users.noreply.github.com>
Co-authored-by: Minemoder5000 <minemoder50000@gmail.com>
Co-authored-by: Spanky <scott@wearejacob.com>
Co-authored-by: Spessmann <156740760+Spessmann@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: brainfood1183 <113240905+brainfood1183@users.noreply.github.com>
Co-authored-by: Deerstop <edainturner@gmail.com>
Co-authored-by: B_Kirill <153602297+B-Kirill@users.noreply.github.com>
Co-authored-by: archee1 <archee3@hotmail.co.uk>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Quantum-cross <7065792+Quantum-cross@users.noreply.github.com>
Co-authored-by: poklj <compgeek223@gmail.com>
Co-authored-by: Krunklehorn <42424291+Krunklehorn@users.noreply.github.com>
Co-authored-by: OnyxTheBrave <131422822+OnyxTheBrave@users.noreply.github.com>
Co-authored-by: UpAndLeaves <92269094+Alpha-Two@users.noreply.github.com>
Co-authored-by: Flareguy <78941145+Flareguy@users.noreply.github.com>
Co-authored-by: Zalycon <84675130+Zalycon@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Verm <32827189+Vermidia@users.noreply.github.com>
Co-authored-by: nikthechampiongr <32041239+nikthechampiongr@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: Dmitry <57028746+dimm00n@users.noreply.github.com>
2025-05-24 11:00:17 +03:00
B_Kirill
b3c4c7c32b
Cleanup warnings: CS8321, CS0105, CS0168 ( #36949 )
...
* Clean up
* CS0168
2025-05-07 20:01:02 -04:00
Zekins
7d6f564344
Merge remote-tracking branch 'upstream/master' into upstream
2025-03-18 02:40:46 +03:00
lzk228
0af3e04fd8
Merge commit '3551eb04115854cdbbf1841f5960c3cdbc508583' into 02-19-upstream
...
# Conflicts:
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/Doors/Systems/AirlockSystem.cs
# Content.Server/Holopad/HolopadSystem.cs
# Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
# Resources/Prototypes/Datasets/Names/borg.yml
# Resources/Prototypes/Datasets/ion_storm.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
# Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Prototypes/Maps/amber.yml
# Resources/Prototypes/Maps/box.yml
# Resources/Prototypes/Maps/convex.yml
# Resources/Prototypes/Maps/fland.yml
# Resources/Prototypes/Maps/meta.yml
# Resources/Prototypes/Maps/plasma.yml
# Resources/ServerInfo/Guidebook/Engineering/AME.xml
# Resources/ServerInfo/Guidebook/Engineering/AirlockSecurity.xml
# Resources/ServerInfo/Guidebook/Engineering/Atmospherics.xml
# Resources/ServerInfo/Guidebook/Engineering/Construction.xml
# Resources/ServerInfo/Guidebook/Engineering/Engineering.xml
# Resources/ServerInfo/Guidebook/Engineering/Fires.xml
# Resources/ServerInfo/Guidebook/Engineering/NetworkConfigurator.xml
# Resources/ServerInfo/Guidebook/Engineering/Networking.xml
# Resources/ServerInfo/Guidebook/Engineering/PortableGenerator.xml
# Resources/ServerInfo/Guidebook/Engineering/Power.xml
# Resources/ServerInfo/Guidebook/Engineering/RTG.xml
# Resources/ServerInfo/Guidebook/Engineering/Shuttlecraft.xml
# Resources/ServerInfo/Guidebook/Engineering/Singularity.xml
# Resources/ServerInfo/Guidebook/Engineering/TEG.xml
# Resources/ServerInfo/Guidebook/NewPlayer/Controls/Controls.xml
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/icon.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-left.png
# Resources/Textures/Clothing/Head/Helmets/paramedhelm.rsi/inhand-right.png
# Resources/Textures/Clothing/OuterClothing/Hardsuits/goliath.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Hardsuits/paramed.rsi/meta.json
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/equipped-OUTERCLOTHING.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/icon.png
# Resources/Textures/Clothing/OuterClothing/Vests/hazard.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/ancient.rsi/meta.json
# Resources/Textures/Clothing/Uniforms/Jumpsuit/security_trooper.rsi/inhand-right.png
# Resources/Textures/Interface/Actions/actions_fakemindshield.rsi/icon-on.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/icon.png
# Resources/Textures/Objects/Storage/Briefcases/briefcase_brown.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/beaker.png
# Resources/Textures/Objects/Storage/boxes.rsi/bodybags.png
# Resources/Textures/Objects/Storage/boxes.rsi/bottle.png
# Resources/Textures/Objects/Storage/boxes.rsi/box.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_hug.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_of_doom_big.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_science.png
# Resources/Textures/Objects/Storage/boxes.rsi/box_security.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwide.png
# Resources/Textures/Objects/Storage/boxes.rsi/boxwidetoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/candle.png
# Resources/Textures/Objects/Storage/boxes.rsi/circuit.png
# Resources/Textures/Objects/Storage/boxes.rsi/clown.png
# Resources/Textures/Objects/Storage/boxes.rsi/darts.png
# Resources/Textures/Objects/Storage/boxes.rsi/disk.png
# Resources/Textures/Objects/Storage/boxes.rsi/emergencytank.png
# Resources/Textures/Objects/Storage/boxes.rsi/encryptokey.png
# Resources/Textures/Objects/Storage/boxes.rsi/evidence_markers.png
# Resources/Textures/Objects/Storage/boxes.rsi/extendedtank.png
# Resources/Textures/Objects/Storage/boxes.rsi/flare.png
# Resources/Textures/Objects/Storage/boxes.rsi/flashbang.png
# Resources/Textures/Objects/Storage/boxes.rsi/forensic.png
# Resources/Textures/Objects/Storage/boxes.rsi/glasses.png
# Resources/Textures/Objects/Storage/boxes.rsi/handcuff.png
# Resources/Textures/Objects/Storage/boxes.rsi/headset.png
# Resources/Textures/Objects/Storage/boxes.rsi/heart.png
# Resources/Textures/Objects/Storage/boxes.rsi/holo.png
# Resources/Textures/Objects/Storage/boxes.rsi/implant.png
# Resources/Textures/Objects/Storage/boxes.rsi/inflatable.png
# Resources/Textures/Objects/Storage/boxes.rsi/internals.png
# Resources/Textures/Objects/Storage/boxes.rsi/latex.png
# Resources/Textures/Objects/Storage/boxes.rsi/light.png
# Resources/Textures/Objects/Storage/boxes.rsi/lightmixed.png
# Resources/Textures/Objects/Storage/boxes.rsi/lighttube.png
# Resources/Textures/Objects/Storage/boxes.rsi/magazine.png
# Resources/Textures/Objects/Storage/boxes.rsi/meson.png
# Resources/Textures/Objects/Storage/boxes.rsi/meta.json
# Resources/Textures/Objects/Storage/boxes.rsi/mousetraps.png
# Resources/Textures/Objects/Storage/boxes.rsi/nitrile.png
# Resources/Textures/Objects/Storage/boxes.rsi/omegacart.png
# Resources/Textures/Objects/Storage/boxes.rsi/pda.png
# Resources/Textures/Objects/Storage/boxes.rsi/pillbox.png
# Resources/Textures/Objects/Storage/boxes.rsi/sechud.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellbeanbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflare.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellflash.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellincendiary.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelllethal.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellpractice.png
# Resources/Textures/Objects/Storage/boxes.rsi/shellslug.png
# Resources/Textures/Objects/Storage/boxes.rsi/shelltoy.png
# Resources/Textures/Objects/Storage/boxes.rsi/solution_trays.png
# Resources/Textures/Objects/Storage/boxes.rsi/sterile.png
# Resources/Textures/Objects/Storage/boxes.rsi/swab.png
# Resources/Textures/Objects/Storage/boxes.rsi/syringe.png
# Resources/Textures/Objects/Storage/boxes.rsi/trashbag.png
# Resources/Textures/Objects/Storage/boxes.rsi/vials.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing.png
# Resources/Textures/Objects/Storage/boxes.rsi/writing_of_doom.png
# Resources/Textures/Objects/Storage/boxes.rsi/ziptie.png
# Resources/Textures/Objects/Tiles/tile.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/empgrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/flashbang.rsi/primed.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/icon.png
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/meta.json
# Resources/Textures/Objects/Weapons/Grenades/stingergrenade.rsi/primed.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/base.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/icon.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-1.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-2.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-3.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/mag-unshaded-4.png
# Resources/Textures/Objects/Weapons/Guns/Battery/antiquelasergun.rsi/meta.json
# Resources/Textures/Objects/Weapons/Guns/Rifles/lecter.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/SMGs/vector.rsi/equipped-BACKPACK.png
# Resources/Textures/Objects/Weapons/Guns/Shotguns/pump.rsi/equipped-BACKPACK.png
2025-02-19 03:00:13 +01:00
Simon
29029d2586
Add ability for admins to change certain cvars via command. ( #35105 )
...
* Add ability for admins to change certain cvars via command.
* Cleanup
* More cleanup.
* Even more cleanup.
* WAITER! WAITER! ONE MORE COMMIT PLEASE!
* Remove requirement for Admin AdminFlag
Not needed as the command checks for the perms.
* Add search function to CVars and help text
* Move to controller instead.
* Add another cvar for testing
* Remove unused comment
* Move to Post Server Initialize
LoC does not work at the earlier stages of server initalization
* Remove unneeded comment
We clear out list so its no longer needed
2025-02-16 10:06:13 +01:00
Pieter-Jan Briers
71c9dfc9ea
Add system to kick people if they connect to multiple servers at once. ( #34563 )
2025-01-22 00:23:47 +01:00
Morb0
996b761d80
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Packaging/ClientPackaging.cs
# Content.Server/Administration/Systems/AdminSystem.cs
# Content.Server/GameTicking/GameTicker.StatusShell.cs
# Content.Shared/Preferences/HumanoidCharacterProfile.cs
# Resources/Prototypes/Entities/Stations/base.yml
# Resources/Prototypes/Entities/Structures/Machines/lathe.yml
# Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_1.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_2.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_3.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_4.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_5.rsi/meta.json
# Resources/Textures/Structures/Power/Generation/Singularity/singularity_6.rsi/meta.json
2025-01-16 13:37:26 +03:00
Palladinium
87779250ee
Add Discord webhook on watchlist connection ( #33483 )
2025-01-15 01:32:24 +01:00
Morb0
f8f0dcb59e
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# Content.Server/Connection/ConnectionManager.cs
2025-01-12 23:13:13 +03:00
Myra
96d913b147
Add IPIntel API support. ( #33339 )
...
Co-authored-by: PJB3005 <pieterjan.briers+git@gmail.com>
2025-01-12 20:41:26 +01:00
Morb0
3ab6d3ef71
Merge remote-tracking branch 'wizards/master' into upstream-sync
...
# Conflicts:
# .github/workflows/publish.yml
# Content.Client/VoiceMask/VoiceMaskNameChangeWindow.xaml.cs
# Content.Server/GameTicking/GameTicker.Player.cs
# Content.Server/VoiceMask/VoiceMaskComponent.cs
# Content.Server/VoiceMask/VoiceMaskSystem.Equip.cs
# Content.Server/VoiceMask/VoiceMaskSystem.cs
# Content.Server/VoiceMask/VoiceMaskerComponent.cs
# Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
# Resources/Prototypes/Entities/Clothing/Masks/specific.yml
# Resources/Prototypes/Entities/Mobs/NPCs/regalrat.yml
# Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.yml
# Resources/Prototypes/Roles/Jobs/Command/captain.yml
# Resources/Prototypes/Roles/Jobs/Command/head_of_personnel.yml
# Resources/Prototypes/Roles/Jobs/Engineering/chief_engineer.yml
# Resources/Prototypes/Roles/Jobs/Medical/chief_medical_officer.yml
# Resources/Prototypes/Roles/Jobs/Science/research_director.yml
# Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
# Resources/Prototypes/Roles/Jobs/Wildcards/psychologist.yml
# Resources/Textures/Objects/Misc/bureaucracy.rsi/meta.json
# Resources/Textures/Objects/Misc/bureaucracy.rsi/paper_stamp-psychologist.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Tiles/attributions.yml
# Resources/Textures/Tiles/blue_circuit.png
# Resources/Textures/Tiles/green_circuit.png
# Resources/Textures/Tiles/steel.png
2024-10-04 19:47:54 +03:00
ArchRBX
241be37185
AstroNav GPS Cartridge ( #32194 )
...
* initial commit
* adds astronav cartridge to QM locker
* changes requested in review
* fix merge conflicts
* fixes the statuscontrol disappearing if you eject the cartridge but still have it installed
* fix notificationsenabled on salv pda proto
* fixes lingering statuscontrol on eject while held
---------
Co-authored-by: archrbx <punk.gear5260@fastmail.com>
2024-09-24 19:02:51 +02:00
Morb0
d9bfc5cdcb
Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync
...
# Conflicts:
# .github/PULL_REQUEST_TEMPLATE.md
# Content.Server/GameTicking/GameTicker.Spawning.cs
# Resources/Prototypes/Datasets/Names/ai.yml
# Resources/Prototypes/Entities/Clothing/Head/hardsuit-helmets.yml
# Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
# Resources/Prototypes/Maps/cog.yml
# Resources/Prototypes/Roles/Jobs/Civilian/visitor.yml
# Resources/Prototypes/Roles/Jobs/departments.yml
# Resources/ServerInfo/Guidebook/Security/Forensics.xml
# Resources/Textures/Structures/Furniture/Tables/reinforced.rsi/state_7.png
# Resources/Textures/Structures/Walls/solid.rsi/meta.json
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_construct-5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over0.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over1.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over2.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over3.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over4.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over5.png
# Resources/Textures/Structures/Walls/solid.rsi/reinf_over6.png
# Resources/Textures/Structures/Walls/solid.rsi/rgeneric.png
# Resources/Textures/Structures/Walls/solid.rsi/solid0.png
# Resources/Textures/Structures/Walls/solid.rsi/solid1.png
# Resources/Textures/Structures/Walls/solid.rsi/solid2.png
# Resources/Textures/Structures/Walls/solid.rsi/solid3.png
# Resources/Textures/Structures/Walls/solid.rsi/solid4.png
# Resources/Textures/Structures/Walls/solid.rsi/solid5.png
# Resources/Textures/Structures/Walls/solid.rsi/solid6.png
# Resources/Textures/Structures/Walls/solid.rsi/solid7.png
2024-09-11 10:56:49 +03:00
