NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-11-14 23:14:16 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 13
39686 commits 14 branches 0 tags 3 GiB
Commit graph

39686 commits

This branch
This branch
All branches
Author SHA1 Message Date
kosticia
bfc0d8ef49
Отключение летних лоббиартов. Починка лицензии (#3458) 2025-12-01 17:12:31 +07:00
kosticia
507680f38b
Аудит правил корвакса (#3453) 
Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
 2025-12-01 16:59:17 +07:00
nukkuminen
785f011e16
Изменение локалей кодов (#3459) 2025-12-01 15:21:21 +07:00
Dmitry
7a5e823364
Merge pull request #3457 from DIMMoon1/upstream11.2 
Upstream11.2
 2025-11-25 06:26:06 +07:00
Dmitry
d3fb690932 okak 2025-11-25 06:15:03 +07:00
Dmitry
542524c4da ftlfix 2025-11-25 05:58:41 +07:00
Dmitry
67e1d295c4 Merge remote-tracking branch 'origin/master' into upstream11.2 2025-11-25 05:37:23 +07:00
kosticia
51ca3477b7
Порт локали апстрима 19.11.25 (#3455) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
Co-authored-by: Dmitry <57028746+DIMMoon1@users.noreply.github.com>
 2025-11-25 05:34:47 +07:00
kosticia
f69ab92f6c
Порт локали апстрима 28.10.25 (#3450) 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: JunJun <nekitnea@gmail.com>
Co-authored-by: lapatison <100279397+lapatison@users.noreply.github.com>
Co-authored-by: cfif126 <94059374+cfif126@users.noreply.github.com>
 2025-11-25 05:32:12 +07:00
Dmitry
f392e9601a merge remote stable, upstream 2025-11-25 05:28:10 +07:00
Myra
85ac084cb3
Stable release (#41558) 2025-11-23 16:17:04 +01:00
slarticodefast
5e294dcecc
Revert 39040 FTL Fixes (#41540) 
Revert "FTL Fixes (#39040)"

This reverts commit 52a9f9b576.
 2025-11-23 05:14:12 -08:00
Errant
8d4888b726
HOTFIX Add logging to gamepreset fallback (#41522) 
* Add logging to gamepreset fallback

* cleanup
 2025-11-21 23:48:00 +01:00
ThatGuyUSA
fb55064420
Munitions visibility tweaking and cleanup (#41137) 
* I didn't make an init commit, 1: because i forgot, 2: because the PR is so tiny, the whole thing is done already

* beans and shards no glow, clean up

* commented out PointLight, does too little for how straining it would be

* Improvised shells now use shards as their bullet sprite, they still don't embed though
 2025-11-20 05:07:01 +00:00
Noah Beverly
91f5138a61
Mail Cart (#41482) 
* Add mailcart crate type

* Add recent progress, move location of mailcart.rsi

* Allow letters and packages to be inserted

* Add updated sprites for mailcart

* Add storage for letters

* Bugfix for sprite

* Add fix for mincount mailcart sprite updates

* Add dynamic names to packages in mailcart

* Add additional whitelist items

* Update tag comments

* Remove max item size

* Update fixture for mailcart, remove unused code from crates.yml

* Add mail cart to cargo ordering

* Update meta.json

* Remove unused comment

* Update copyright

* Add missing ContainerContainer

* Update ContainerContainer

* Revert "Update ContainerContainer"

This reverts commit 1805dcd58d8c0f52baca9db0d3173940ee241159.

* Remove container slots and increase storage

* Remove unused tags

* Remove LetterDelivery tag

---------

Co-authored-by: Justin Pfeifler <jrpl101998@gmail.com>
 2025-11-20 04:18:19 +00:00
PJBot
b080ce7133 Automatic changelog update 2025-11-19 22:16:34 +00:00
korczoczek
dd1ba4cd95
Make the crimson evac shuttle's air chamber not borderline blow up (#41500) 
glass and plasma together strong
 2025-11-19 22:03:09 +00:00
lzk
905fc6a783
cleanup evil beach ball (#41499) 2025-11-19 20:44:36 +00:00
korczoczek
922e397f34
Fix blinking animation of disembodied head hologram (#41498) 
start blinking normal
 2025-11-19 20:34:54 +00:00
Samuka
de947988fe
Fix the round end trigger for xenoborgs (#41467) 
math
 2025-11-19 08:56:43 +00:00
Tiniest Shark
00ba4595a8
Remove Basic Hardsuit Helmet Sprites (#41490) 
* Deletes basic helmet

* you forgot one file

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-11-19 08:40:38 +00:00
PJBot
3d46894cb4 Automatic changelog update 2025-11-19 02:59:43 +00:00
Hitlinemoss
be68bb6c0c
Removed redundant clothing from CMO locker; moved neck gaiter from HoS locker to HoS dresser (#41487) 2025-11-19 02:46:44 +00:00
āda
224f0fd507
AdminLogOnTrigger (#41474) 
* commit

* requested

* also requested

* Update Content.Shared/Trigger/Components/Effects/AdminLogOnTriggerComponent.cs

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-11-19 02:08:04 +00:00
āda
78101bceac
5 new triggers: EmptyContainers, Knockdown, Stun, TriggerOnThrowDoHit (#41472) 
* ideas

* finish components

* systems

* one more

* requested

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-11-19 02:05:13 +00:00
slarticodefast
414817e38a
AddTagOnTrigger, RemoveTagOnTrigger, SwapPositionOnTrigger, JitterOnTrigger (#41476) 
* more triggers

* comment

---------

Co-authored-by: iaada <iaada@users.noreply.github.com>
 2025-11-19 01:58:50 +00:00
nukkuminen
6abe370b77
change microwave inhand (#3451) 2025-11-19 01:35:01 +07:00
slarticodefast
e3c0e01934
Cleanup TipsSystem, add TippyOnTrigger (#41477) 
* tippy on trigger and refactor

* optional parameter for command
 2025-11-18 18:09:49 +00:00
Samuka
9bab0a3287
add 2 empty lines to xenoborg round end text (#41436) 
* add 2 empty lines

* add one line on the top

* swap from the start to the end
 2025-11-18 17:44:13 +00:00
kosticia
b5705881eb
update evac sprite 
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
 2025-11-18 18:00:00 +07:00
nukkuminen
e65c5ff725
Старые звуки смены кодов (#3449) 2025-11-18 16:25:11 +07:00
lzk
6f89f6eadb
cleanup corvax containers (#3446) 2025-11-18 15:44:36 +07:00
cammusubi
6e8435e080
Per issue #41143, 'ClusterBang' was changed to 'clusterbang' (#41470) 
Per issue #41143, 'ClusterBang' was changed to display as 'clusterbang' in-game.
 2025-11-18 00:06:15 +00:00
PJBot
ff0f4e9028 Automatic changelog update 2025-11-17 18:08:37 +00:00
Samuka
9ef56974fb
Examine which borg that module fits into (#41461) 
* modules tip

* add color

* solved a edge case

* use ContentLocalizationManager instead of hardcoded grammar

* improve summary

* improve improved summary

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* not my first language

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* keep names consistent

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* keep consistent part 2

* fixed the yml error

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-11-17 17:55:55 +00:00
PJBot
b59ecdba6a Automatic changelog update 2025-11-17 17:43:35 +00:00
Samuka
8acd30463d
Make mothership core able to pull (#41460) 
* make mothership core able to pull again

* make it work like borgs
 2025-11-17 17:31:03 +00:00
Samuka
28eeaa5d9f
Update mothership (#41453) 
* add body crusher sprites

* body crusher yml

* add xenoborg thruster sprites

* add xenoborg thruster yml

* update mothership

* only one IFF computer

* tabs

* fuck

* fixed indentation

* replace tabs with spaces

* change id MachineBodyCrusher to MachineArtifactCrusherXenoborg

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* change id XenoborgThruster to ThrusterXenoborg

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>

* update Ids in mothership

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-11-17 14:46:54 +00:00
PJBot
e88d2b7481 Automatic changelog update 2025-11-17 00:00:55 +00:00
slarticodefast
508f45e81d
Make crawl speed depend on your free hand count (#41458) 
* crawl speed

* I can't spell
 2025-11-16 23:48:25 +00:00
slarticodefast
17ed12b1ca
fix DamageAbleSystem.SetDamage (#41456) 
fix SetDamage
 2025-11-16 20:46:02 +00:00
Tobias Berger
5c5ad10a77
Fix typo in PR template (#41451) 
My browser keeps pointing it out and I don't like it :⁾
 2025-11-16 13:44:18 +00:00
PJBot
9d4261df40 Automatic changelog update 2025-11-16 10:35:47 +00:00
Ben Dake
f727d7ba42
Vulp crying now uses whining sounds (#40982) 
* Change vulp whine emote name to crying

* Fix vulp yaml

* Add whining back for typing

* review

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
 2025-11-16 10:22:45 +00:00
github-actions[bot]
0141993d1d
Update Credits (#41449) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-11-16 02:26:42 +01:00
PJBot
18211e8b6e Automatic changelog update 2025-11-16 01:04:25 +00:00
Princess Cheeseballs
6c78ff5ab9
Fix Gas Reagent Thresholds. (#41438) 
* Fix reagent gas scales

* add comment

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
 2025-11-16 00:51:26 +00:00
PJBot
3e0ab613ca Automatic changelog update 2025-11-15 23:32:37 +00:00
ScarKy0
cee38b7bfe
Remove Aghosts from "Warp to Most Followed" (#41448) 
* init

* review
 2025-11-15 23:18:11 +00:00
PJBot
409ef02871 Automatic changelog update 2025-11-15 23:20:09 +00:00