Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
Files
d2d501dbc01b2b99857e5c32e50adc1eabcffeac
OldThink/Content.Client
History
Remuchi d2d501dbc0 Merge remote-tracking branch 'upstream/master' into upstream 
# Conflicts:
#	Content.Client/Access/AccessOverlay.cs
#	Content.Client/Access/UI/IdCardConsoleBoundUserInterface.cs
#	Content.Client/Access/UI/IdCardConsoleWindow.xaml
#	Content.Client/Access/UI/IdCardConsoleWindow.xaml.cs
#	Content.Client/Chemistry/UI/InjectorStatusControl.cs
#	Content.Client/StatusIcon/StatusIconOverlay.cs
#	Content.Client/Stylesheets/StyleNano.cs
#	Content.Client/UserInterface/Systems/Chat/ChatUIController.cs
#	Content.Client/UserInterface/Systems/Chat/Widgets/ChatBox.xaml
#	Content.Server/Access/Systems/IdCardConsoleSystem.cs
#	Content.Server/Administration/Commands/AGhost.cs
#	Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
#	Content.Server/Connection/ConnectionManager.cs
#	Content.Server/DeviceLinking/Systems/SignalTimerSystem.cs
#	Content.Server/Disposal/Unit/EntitySystems/DisposalUnitSystem.cs
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Server/Resist/EscapeInventorySystem.cs
#	Content.Server/Shuttles/Systems/EmergencyShuttleSystem.cs
#	Content.Shared/Access/Components/IdCardConsoleComponent.cs
#	Content.Shared/Anomaly/SharedAnomalySystem.cs
#	Content.Shared/Bed/Sleep/SharedSleepingSystem.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
#	Content.Shared/Lock/LockSystem.cs
#	Content.Shared/RCD/Systems/RCDSystem.cs
#	Content.Shared/Roles/JobPrototype.cs
#	Content.Shared/StatusIcon/StatusIconPrototype.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/rcd/components/rcd-component.ftl
#	Resources/Maps/reach.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/cola.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/pwrgame.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/shamblersjuice.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/soda.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/spaceup.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/starkist.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml
#	Resources/Prototypes/DeviceLinking/sink_ports.yml
#	Resources/Prototypes/Entities/Clothing/Back/duffel.yml
#	Resources/Prototypes/Entities/Clothing/Belt/base_clothingbelt.yml
#	Resources/Prototypes/Entities/Clothing/Neck/misc.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/base_clothingouter.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/wintercoats.yml
#	Resources/Prototypes/Entities/Mobs/Customization/Markings/gauze.yml
#	Resources/Prototypes/Entities/Objects/Devices/Electronics/door.yml
#	Resources/Prototypes/Entities/Objects/Magic/books.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/glass.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/metal.yml
#	Resources/Prototypes/Entities/Objects/Materials/Sheets/other.yml
#	Resources/Prototypes/Entities/Objects/Misc/tiles.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/morgue.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Ammunition/Projectiles/shotgun.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/highsec.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
#	Resources/Prototypes/Entities/Structures/Doors/MaterialDoors/material_doors.yml
#	Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
#	Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
#	Resources/Prototypes/Entities/Structures/Machines/lathe.yml
#	Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
#	Resources/Prototypes/Entities/Structures/Storage/Tanks/base_structuretanks.yml
#	Resources/Prototypes/Entities/Structures/Walls/grille.yml
#	Resources/Prototypes/Recipes/Construction/Graphs/structures/shutter.yml
#	Resources/Prototypes/Recipes/Crafting/Graphs/improvised/flowercrown.yml
#	Resources/Prototypes/Recipes/Crafting/improvised.yml
#	Resources/Prototypes/Roles/Jobs/Security/detective.yml
#	Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/StatusEffects/health.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Prototypes/lobbyscreens.yml
#	Resources/Textures/Clothing/OuterClothing/Hardsuits/ERTSuits/ertchaplain.rsi/equipped-OUTERCLOTHING-body-slim.png
#	Resources/Textures/Decals/bricktile.rsi/white_box.png
#	Resources/Textures/Objects/Misc/books.rsi/meta.json
#	Resources/migration.yml
2024-04-13 11:29:33 +07:00
..
_Ohio
ура срем в мастер ура ура ура
2024-03-12 16:34:31 +05:00
_White
Я скучаю так очень, забери меня срочно
2024-03-28 00:13:47 +07:00
Access
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Actions
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)
2024-03-18 23:35:46 +01:00
Administration
Я скучаю так очень, забери меня срочно
2024-03-28 00:13:47 +07:00
AlertLevel
…
Alerts
Reduced Warning Count By 130 For Full Rebuilds (#26518)
2024-03-29 16:28:16 +11:00
Ame/UI
Refactor AME to use ItemSlot for Fuel (#25558)
2024-02-29 16:44:28 -05:00
Animations
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Anomaly
Anomalies behaviours (#24683)
2024-04-01 19:29:13 +11:00
Antag
Initial Infected can see each other (#25934)
2024-03-18 15:57:36 -06:00
Arcade
…
Armor
…
Atmos
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
Audio
Update audioparams (#26387)
2024-03-29 16:55:05 +11:00
BarSign
…
Beam
…
Bed
Shuttle console + FTL rework (#24430)
2024-03-03 18:39:19 +11:00
Body/Systems
…
Borer
- fix: borer ui
2024-02-08 19:00:56 +06:00
Botany
Fix clientside storage Whitelists (#24063)
2024-02-02 00:33:57 +11:00
Bql
…
Buckle
Remove vehicles (#24681)
2024-02-01 11:33:10 +11:00
Cabinet
…
Camera
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
CardboardBox
Obsolete Logger cleanup for EntitySystems part 2 (#26159)
2024-03-17 18:31:09 +11:00
Cargo
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
CartridgeLoader
News UI overhaul and PDA notifications (#19610)
2024-02-26 21:38:00 -04:00
Changelog
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
CharacterAppearance
…
CharacterInfo
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Charges/Systems
…
Chasm
…
Chat
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Chemistry
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Clickable
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Cloning/UI
…
CloningConsole/UI
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Clothing
Reduced Warning Count By 130 For Full Rebuilds (#26518)
2024-03-29 16:28:16 +11:00
CombatMode
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Commands
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Communications
Hallway textscreens (#24189)
2024-01-27 08:51:24 -05:00
Computer
…
Configurable/UI
…
Construction
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
ContextMenu/UI
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Cooldown
…
Crayon
Open some windows non-centered to avoid covering the player (#24767)
2024-02-01 23:49:48 +11:00
Credits
…
CrewManifest
Make department / job list sorting consistent. (#25486)
2024-02-23 15:04:44 +11:00
CriminalRecords
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Cuffs
…
Damage
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
DamageState
…
DebugMon
…
Decals
Я скучаю так очень, забери меня срочно
2024-03-28 00:13:47 +07:00
DeviceLinking
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Devour
…
Dice
…
Disposal
Toilet Upgrade (needs review) (#22133)
2024-03-31 14:21:18 +11:00
DoAfter
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Doors
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Dragon
…
Drugs
Added winddown to space drugs effect (#25652)
2024-03-09 22:33:40 +03:00
Drunk
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Effects
…
Electrocution
…
Emp
…
Ensnaring
…
Entry
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
Eui
…
Examine
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Explosion
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Extinguisher
…
Eye
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Fax
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Flash
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
FlavorText
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Fluids
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
Forensics
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Fullscreen
…
Gameplay
Code cleanup: Purge calls to obsolete EntityCoordinates methods (#26292)
2024-03-21 12:59:56 +11:00
GameTicking/Managers
fix: lobby music volume will be changed on options change without restart (also lobby music not looped anymore) (#25530)
2024-03-02 15:40:04 -05:00
Gateway/UI
…
Ghost
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
GhostKick
…
GPS
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Gravity
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Guidebook
Shuttle console + FTL rework (#24430)
2024-03-03 18:39:19 +11:00
Hands
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
HealthAnalyzer/UI
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Holiday
…
HotPotato
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Humanoid
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
IconSmoothing
Reduced Warning Count By 130 For Full Rebuilds (#26518)
2024-03-29 16:28:16 +11:00
IdentityManagement
…
Implants
…
Info
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Input
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Instruments
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Interactable
…
Interaction
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Inventory
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
IoC
перенос файлов клиента из папки White в _White
2024-01-28 17:59:43 +07:00
Items
Reduced Warning Count By 130 For Full Rebuilds (#26518)
2024-03-29 16:28:16 +11:00
Jittering
…
Kitchen
Add auto modes to reagent grinder (#26290)
2024-03-29 17:30:50 +11:00
Kudzu
…
Labels
Add prediction to hand labeler labels (#25869)
2024-03-06 12:33:28 +11:00
LateJoin
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
Lathe
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Launcher
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Light
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Lightning/Components
…
Lobby
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Lock/Visualizers
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
MachineLinking/UI
…
MagicMirror
…
MainMenu
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Mapping
Partial atmos refactor (#22521)
2024-03-24 03:34:56 +11:00
Maps
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Markers
…
MassMedia
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Materials
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Mech
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Medical
Suit Sensors No Longer Use a Hardcoded 'Total Health' (#26658)
2024-04-04 02:38:27 -06:00
MedicalScanner
…
Message
…
Mind
…
Mining
…
Miracle/Changeling
- add: Changeling antagonist (#2)
2024-01-31 14:01:35 +00:00
Morgue/Visualizers
…
MouseRotator
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Movement/Systems
Code Cleanup: Purge obsolete MapManager methods (#26279)
2024-03-22 18:08:40 +11:00
NetworkConfigurator
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Ninja/Systems
…
NodeContainer
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
NPC
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-30 10:36:17 +07:00
Nuke
…
NukeOps
Refactor antag rule code (#23445)
2024-02-29 17:25:10 +11:00
Nutrition/EntitySystems
scoopable ash and foam, solution transfer prediction (#25832)
2024-04-01 17:27:39 +11:00
Objectives/Systems
…
Options
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Orbit
…
Outline
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Overlays
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
PAI
…
Paper
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Parallax
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
ParticleAccelerator
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
PDA
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Physics
Pulling rework v2 (#24936)
2024-03-19 14:30:56 +11:00
Pinpointer
Make the buttons on the map ui not squished (#26604)
2024-03-31 19:51:02 +11:00
Placement/Modes
…
Players
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
PneumaticCannon
…
Pointing
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Points
…
Popups
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Power
Shuttle console + FTL rework (#24430)
2024-03-03 18:39:19 +11:00
PowerCell
…
Preferences
Ведь без тебя нет смысла жить
2024-03-28 01:16:08 +07:00
Projectiles
…
Radiation
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Radio
…
RatKing
…
RCD
Bug fixes for RCD (#26792)
2024-04-08 13:17:28 +10:00
Remotes
Door Remote now shows Mode in UI (#26162)
2024-03-21 20:19:52 -04:00
Replay
Pulling rework v2 (#24936)
2024-03-19 14:30:56 +11:00
Research
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Resources
…
Revenant
dynamic alert sprites (#25452)
2024-03-28 17:32:56 +11:00
Revolutionary
Rev Components are no longer leaked + Rev and Zombie icon visibility to ghosts is now controlled by a cvar (#22194)
2024-02-02 00:08:03 +11:00
Roles
…
Rotation
…
RoundEnd
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Salvage
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Sandbox
Code cleanup: Purge calls to obsolete EntityCoordinates methods (#26292)
2024-03-21 12:59:56 +11:00
Screenshot
…
SeedAnalyzer/UI
…
SensorMonitoring
…
Sericulture
…
Shuttles
Coordinates Disks & Shuttle FTL Travel (#23240)
2024-04-01 15:50:00 +11:00
Silicons
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Singularity
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Smoking
…
Sound
…
Speech/EntitySystems
…
SprayPainter
spray painter rework (#23287)
2024-02-02 09:30:46 +11:00
Sprite
Fashion is my profession - Procedural jumpsuit variants (#25888)
2024-03-15 18:37:12 +11:00
SSDIndicator
Fix SSD indicator (#24589)
2024-02-01 19:30:07 +11:00
Stack
…
Station
…
StationRecords
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
StatusIcon
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Stealth
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Sticky/Visualizers
…
Storage
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Store/Ui
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
Strip
…
Stunnable
…
Stylesheets
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
SubFloor
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
SurveillanceCamera
…
Tabletop
Revert "Fix chat bubbles (#25643)" (#25645)
2024-02-28 00:51:20 +11:00
Teleportation
…
TextScreen
cancelable brig timers (#26557)
2024-03-31 16:44:02 -04:00
Thief
…
Throwing
Pulling rework v2 (#24936)
2024-03-19 14:30:56 +11:00
Toggleable
…
Tools
Fix welder status always being "not lit" (#24705)
2024-01-29 16:04:52 -07:00
Traits
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Trigger
…
UserInterface
Merge remote-tracking branch 'upstream/master' into upstream
2024-04-13 11:29:33 +07:00
VendingMachines
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Verbs
Obsolete Logger cleanup for EntitySystems part 2 (#26159)
2024-03-17 18:31:09 +11:00
Viewport
…
VoiceMask
пара фиксов
2024-03-30 11:33:13 +07:00
Voting
…
Wall
…
Weapons
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Weather
Code cleanup: Dirty(Comp) (#26238)
2024-03-19 23:27:02 -04:00
Wires
- add: OldNeoInterface (#108)
2024-03-20 22:54:45 +03:00
Xenoarchaeology
…
Zombies
Fix initial infected icon hiding (#26585)
2024-03-31 12:20:45 +11:00
AssemblyInfo.cs
…
Content.Client.csproj
Merge branch 'master' of https://github.com/space-wizards/space-station-14 into upstream
2024-03-26 15:52:23 +07:00
Content.Client.csproj.DotSettings
…
GlobalUsings.cs
…
Program.cs
…