Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
Files
eb78be2549bbdd0dbfa7145dd146f51e64e5e8ea
OldThink/Content.Server
History
Cinka 2d24788571 Merge remote-tracking branch 'upstream/master' into upstream 
# Conflicts:
#	Content.Client/_Ohio/UI/AnimatedBackgroundControl.cs
#	Resources/Prototypes/_White/AnimatedLobbyScreens/lobbyScreens.yml
2024-03-17 15:51:30 +03:00
..
_Amour
Fixes (#73)
2024-03-11 11:13:33 +03:00
_Miracle
- fix: Fix gulag again (#37)
2024-02-08 11:38:26 +00:00
_White
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-17 15:51:30 +03:00
Abilities/Mime
Firestarter fixes (#24647)
2024-02-01 00:01:52 +11:00
Access
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Actions
…
Acz
…
Administration
Re: Re: """апгрейд""" QuickDialogSystem (#150)
2024-02-29 20:16:53 +00:00
Advertise
Reduce vendor thank you message spam and add variety (#23746)
2024-01-08 18:34:47 -07:00
Advertisements
Reduce vendor thank you message spam and add variety (#23746)
2024-01-08 18:34:47 -07:00
Afk
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Alert
Emergency revert for pulling (#24923)
2024-02-03 10:32:30 -08:00
AlertLevel
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Ame
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Animals
Revert 'Revert 'Solution Entities'' (#23168)
2023-12-29 08:47:43 -04:00
Announcements
…
Anomaly
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Antag
Bugfixes (#123)
2024-02-25 14:02:11 +07:00
Arcade
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Armor
Add price multiplier for armor component (#24561)
2024-01-25 17:04:01 -05:00
Atmos
Ling update (#183)
2024-03-13 19:19:30 +03:00
Audio
Use ECS prototype-reload events (#22613)
2023-12-23 01:13:45 +11:00
BarSign/Systems
…
Beam
…
Bed
Ремув попапа сна (#146)
2024-03-11 02:07:37 +03:00
Bible
Revenant stuff (#110)
2024-02-23 16:06:24 +00:00
Body
Ling update (#183)
2024-03-13 19:19:30 +03:00
Borer
- fix: Fixed taking damage while in the host's body (#40)
2024-02-09 23:46:57 +00:00
Botany
Меньше попапов в чат (#143)
2024-02-29 17:36:13 +07:00
Buckle/Systems
Powered stasis bed prevents body decay (#23520)
2024-01-09 01:40:52 -05:00
Cabinet
…
Camera
…
CardboardBox
…
Cargo
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
CartridgeLoader
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Changeling
Ling update (#183)
2024-03-13 19:19:30 +03:00
CharacterInfo
Economy (#403)
2024-01-24 13:04:22 +03:00
Charges
…
Chat
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Chemistry
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Chunking
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Cloning
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Clothing
…
Cluwne
…
CombatMode
…
Commands
Action, Action Container, and Action Upgrade changes (#24005)
2024-01-14 23:37:38 -07:00
Communications
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Configurable
…
Connection
Bugfixes (#69)
2024-02-14 16:52:07 +00:00
Construction
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Containers
Content ecs containers (#22484)
2023-12-28 01:30:03 -04:00
Contests
…
Coordinates
…
CPUJob/JobQueues/Queues
…
Crayon
…
CrewManifest
Upstream upstream
2024-01-27 09:34:07 +03:00
CriminalRecords/Systems
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Cuffs
…
Damage
Ремув попапа сна (#146)
2024-03-11 02:07:37 +03:00
Database
Fixes (#73)
2024-03-11 11:13:33 +03:00
Decals
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Defusable
Move grenade components to shared (#22691)
2024-02-02 00:29:01 +11:00
Destructible
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
DetailExaminable
перенос общих файлов из папки White в _White
2024-01-28 18:37:24 +07:00
DeviceLinking
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
DeviceNetwork
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Devour
Content ecs containers (#22484)
2023-12-28 01:30:03 -04:00
Dice
…
Discord
…
Disposal
Меньше попапов в чат (#143)
2024-02-29 17:36:13 +07:00
DoAfter
…
Doors
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Dragon
…
Drone
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Drunk
…
Effects
…
Electrocution
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Emoting
фиксы тестов
2024-01-29 01:02:37 +07:00
Emp
…
EnergyDome
Залью спеллы потестить, мне похуй ПР НОМЕР 156
2024-03-07 16:01:54 +00:00
Engineering
…
Ensnaring
Content ecs containers (#22484)
2023-12-28 01:30:03 -04:00
EntityList
…
Entry
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
EUI
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Examine
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Execution
Fix popups (#176)
2024-03-04 13:56:23 +07:00
Explosion
Bug fixes (#151)
2024-03-01 09:05:26 +07:00
Extinguisher
Revert 'Revert 'Solution Entities'' (#23168)
2023-12-29 08:47:43 -04:00
Eye/Blinding
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11: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
Fluids
- fix: Holy water fix. (#159)
2024-03-02 16:08:32 +07:00
Forensics
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Friends
…
GameTicking
Tweaks (#170)
2024-03-04 14:02:16 +07:00
Gateway
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Gatherable
…
GenericAntag
Store ninja objectives in conditions 2 (#20894)
2024-01-29 15:06:32 +11:00
Ghost
Gulag v2 (#21)
2024-02-03 11:39:40 +00:00
GhostKick
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Glue
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Gravity
Upstream upstream
2024-01-27 09:34:07 +03:00
Guardian
Make some damage sources not cancel do afters (#24635)
2024-01-28 10:51:54 +11:00
GuideGenerator
Make some prototypes use frozen collections (#22576)
2023-12-25 15:12:22 +11:00
Hands/Systems
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
HealthExaminable
…
Holiday
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Holosign
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
HotPotato
…
Humanoid
Merge remote-tracking branch 'upstream/master' into upstream
2024-03-02 16:39:39 +03:00
IdentityManagement
Content ecs containers (#22484)
2023-12-28 01:30:03 -04:00
IgnitionSource
UseDelay + ItemCooldown merge (#22502)
2024-01-03 21:33:09 -04:00
ImmovableRod
Destruction & impact sound rework pass 1 (#24282)
2024-01-19 10:33:07 -05:00
Implants
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Info
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Instruments
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Interaction
Fix popups (#176)
2024-03-04 13:56:23 +07:00
Inventory
Virtual items cleanup (#23912)
2024-01-14 21:18:47 +11:00
IoC
перенос общих файлов из папки White в _White
2024-01-28 18:37:24 +07:00
IP
Dependency update / fixes / skrungle bungle (#23745)
2024-01-12 23:22:01 +01:00
Item
Virtual items cleanup (#23912)
2024-01-14 21:18:47 +11:00
Jittering
…
Jobs
Replace EntityUid parsing with NetEntity (#23474)
2024-01-04 11:04:31 +11:00
KillTracking
DamageSpecifier Total => GetTotal (#24160)
2024-01-21 18:59:14 -07:00
Kitchen
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Labels/Label
Localize preset labels on chem dispenser (#24617)
2024-01-28 14:31:16 -08:00
LandMines
…
Lathe
fix: fix unnecessary devices in shitsilo (#211)
2024-03-16 18:31:06 +03:00
Light
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Lightning
Залью спеллы потестить, мне похуй ПР НОМЕР 156
2024-03-07 16:01:54 +00:00
Lock
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Lube
Revert 'Revert 'Solution Entities'' (#23168)
2023-12-29 08:47:43 -04:00
Magic
Залью спеллы потестить, мне похуй ПР НОМЕР 156
2024-03-07 16:01:54 +00:00
MagicMirror
Всякое по мелочи (#148)
2024-03-01 15:51:17 +07:00
Mapping
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Maps
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
MassMedia
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Materials
fix: fix unnecessary devices in shitsilo (#211)
2024-03-16 18:31:06 +03:00
Mech
Suffocation alerts for nitrogen breathers (#24373)
2024-01-23 15:17:40 -05:00
Medical
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Mind
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Mindshield
…
Mining
…
Mobs
Всякое (#474)
2024-01-24 15:25:34 +03:00
MoMMI
…
Morgue
Examine prediction (#23565)
2024-01-06 17:53:13 +11:00
Motd
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
MouseRotator
…
Mousetrap
Fix clientside storage Whitelists (#24063)
2024-02-02 00:33:57 +11:00
Movement
…
NameIdentifier
Chill bounties + fixes (#23411)
2024-01-03 17:34:47 -07:00
Ninja
Store ninja objectives in conditions 2 (#20894)
2024-01-29 15:06:32 +11:00
NodeContainer
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
NPC
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Nuke
reduce nuke required floor radius variable (#22947)
2023-12-25 01:09:10 -07:00
NukeOps
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Nutrition
Меньше попапов в чат (#143)
2024-02-29 17:36:13 +07:00
Objectives
- fix: Gulagged objective fix. (#130)
2024-02-27 11:59:43 +00:00
PAI
…
Paper
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Parallax
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
ParticleAccelerator
Upstream upstream
2024-01-27 09:34:07 +03:00
Payload/EntitySystems
Examine prediction (#23565)
2024-01-06 17:53:13 +11:00
PDA
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Physics
Emergency revert for pulling (#24923)
2024-02-03 10:32:30 -08:00
Pinpointer
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Placement
…
Plants
…
Players
Upstream upstream
2024-01-27 09:34:07 +03:00
PneumaticCannon
Add events for GunComponent values, muzzle flashes and cartridge spread (#24077)
2024-01-29 10:32:42 +11:00
Pointing
- add: Runes can't be examined by crew. (#129)
2024-02-27 12:00:02 +00:00
Points
…
Polymorph
Cleanups PolymorphSystem/Components/Prototypes (#23721)
2024-02-01 23:17:02 +11:00
Popups
Make popups nullable (#24802)
2024-02-01 23:25:58 -05:00
Power
Залью спеллы потестить, мне похуй ПР НОМЕР 156
2024-03-07 16:01:54 +00:00
PowerCell
…
PowerSink
…
Prayer
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Preferences/Managers
[Feat] Тонкие спрайты снова в строю (#102)
2024-02-24 10:06:32 +00:00
Procedural
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Projectiles
перенос общих файлов из папки White в _White
2024-01-28 18:37:24 +07:00
Pulling
Emergency revert for pulling (#24923)
2024-02-03 10:32:30 -08:00
Puppet
…
Radiation
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Radio
Всякое (#116)
2024-02-24 14:18:25 +00:00
RandomAppearance
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
RandomMetadata
…
RatKing
Rename Miasma to Ammonia (#22791)
2023-12-20 21:19:50 -07:00
Remotes
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Repairable
…
Research
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Resist
Merge branch 'final-version' into upupup
2024-02-05 10:24:33 +03:00
Respawn
…
Revenant
Revenant stuff (#110)
2024-02-23 16:06:24 +00:00
Revolutionary
better deconversion (#23315)
2024-01-14 14:20:35 +11:00
Roles
Багфиксы и всякое (#47)
2024-02-12 16:22:36 +00:00
Rotatable
…
Rotation
Fix rotation visuals desync & appearance state spam (#23016)
2023-12-26 16:32:25 -07:00
RoundEnd
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Salvage
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Sandbox
Upstream upstream
2024-01-27 09:34:07 +03:00
Screens
Hallway textscreens (#24189)
2024-01-27 08:51:24 -05:00
SensorMonitoring
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Sericulture
…
ServerInfo
…
ServerUpdates
…
Shuttles
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Silicons
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Singularity
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Solar
…
Sound
Lock Anomaly generator to research access (#24464)
2024-02-01 19:45:24 +11:00
Spawners
Client customization late-join spawner priority for arrivals/cryostorage (#24586)
2024-02-01 21:12:09 +11:00
Species/Systems
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Speech
fix: персонажи мужского пола вновь издают звуки (#214)
2024-03-17 04:25:45 +03:00
Spider
…
SprayPainter
spray painter rework (#23287)
2024-02-02 09:30:46 +11:00
Spreader
The glowing forest anomaly (#24351)
2024-01-20 17:31:12 -08:00
Sprite
Kobold variety - allows kobolds to have random colors and horns (+ allows RandomSpriteComponent to uh. Actually choose random sprites for specific layers) (#23393)
2024-01-03 17:39:00 -07:00
Stack
…
Standing
…
Station
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
StationEvents
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
StationRecords
- fix: Show true name in station records. (#34)
2024-02-08 09:44:19 +00:00
Stealth
…
Sticky
Content ecs containers (#22484)
2023-12-28 01:30:03 -04:00
Storage
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Store
Ling update (#183)
2024-03-13 19:19:30 +03:00
Strip
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Stunnable
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
SubFloor
…
SurveillanceCamera
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Tabletop
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Teleportation
…
Temperature
Ling update (#183)
2024-03-13 19:19:30 +03:00
Terminator
exterminator midround minor antag (#19946)
2023-12-24 20:16:56 -07:00
Tesla
Tesla Gun (#23175)
2024-01-06 18:18:35 +11:00
Thief
Thief hotfix (#22976)
2023-12-27 12:42:15 -08:00
Tiles
Incendiary projectiles and lava firestack reduction (#23479)
2024-01-08 00:41:42 -05:00
Tips
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Toilet
…
Tools
Generalize tile prying to any tool quality (#24432)
2024-01-22 23:45:40 -08:00
Toolshed/Commands
…
Traitor
Replace EntityUid parsing with NetEntity (#23474)
2024-01-04 11:04:31 +11:00
Traits
Unrevivable trait (#24226)
2024-01-20 13:22:15 +11:00
UserInterface
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
VendingMachines
Fix popups (#176)
2024-03-04 13:56:23 +07:00
Verbs
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
VoiceMask
Upstream upstream
2024-01-27 09:34:07 +03:00
Voting
Upstream upstream
2024-01-27 09:34:07 +03:00
Wagging
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Warps
…
Weapons
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Weather
…
White/ShockClothing
Collars
2024-03-02 16:25:20 +03:00
Whitelist
Obsolete refactor - ConnectedClient to Channel (#24409)
2024-01-23 09:14:13 +11:00
Wires
Decouple panels and wires (#24840)
2024-02-03 15:24:33 +11:00
Worldgen
[Upstream] Upstream (#109)
2024-02-23 16:05:48 +00:00
Xenoarchaeology
Fix popups (#176)
2024-03-04 13:56:23 +07:00
Zombies
Emergency revert for pulling (#24923)
2024-02-03 10:32:30 -08:00
AssemblyInfo.cs
…
Content.Server.csproj
- add: new races - vulpies and tajarans
2024-02-16 13:40:56 +03:00
Content.Server.csproj.DotSettings
…
GlobalUsings.cs
…
Program.cs
…