tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,252 Commits 3 Branches 5 Tags
cca537fb33fd424257d7930386a08901b9a0065c
Commit Graph

30252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
slarticodefast
b0c9c79297 Merge stable into master (#34547) 2025-01-21 00:12:49 +01:00
Errant
671ab10be2 [HOTFIX] Admin Menu player jobs (#34545) 
update job info on spawn
 2025-01-20 23:30:00 +01:00
Errant
60ed142c3c Cherry-pick to stable: Fix emergency_elkridge being saved as a map (#34496) (#34526) 2025-01-20 21:35:30 +01:00
Southbridge
6361a121d5 Plasma Dirt Fix (#34534) 
did the dirt thing
 2025-01-20 03:10:51 -07:00
PJBot
6b6dc13664 Automatic changelog update 2025-01-20 01:25:46 +00:00
Leon Friedrich
c4ed3fc275 Update engine to v240.1.1 (#34527) 2025-01-20 12:24:40 +11:00
Leon Friedrich
64689b4cc8 Fix emergency_elkridge being saved as a map (#34496) 
Save `emergency_elkridge` as a grid

(cherry picked from commit ef50219455)
 2025-01-19 16:51:19 -08:00
PJBot
a84b67a686 Automatic changelog update 2025-01-20 00:33:51 +00:00
K-Dynamic
6ed60fecde Welding gas mask toggleable with action (#32691) 
welding mask removable
 2025-01-20 01:32:45 +01:00
PJBot
9485cb6eb8 Automatic changelog update 2025-01-20 00:22:32 +00:00
ArtisticRoomba
ed44f3263f Fixes some mobs not being able to honk/weh (#33777) 
* fixes some mobs not being able to honk/weh

* addresss review
 2025-01-20 01:21:25 +01:00
Leon Friedrich
40f9170078 Update engine to v240.1.0 (#34524) 2025-01-20 11:07:19 +11:00
Leon Friedrich
ef50219455 Fix emergency_elkridge being saved as a map (#34496) 
Save `emergency_elkridge` as a grid
 2025-01-20 10:59:42 +11:00
PJBot
c0fcf4b93b Automatic changelog update 2025-01-19 19:50:07 +00:00
Winkarst
b09cd1ca8c Make storage implant drop items on gibbing (#33493) 
* Make storage implant drop items on gib/removal

* Better way

* Fix error

* Forgotten trash

* Cleanup

* Unused var

* Update Content.Server/Implants/ImplantedSystem.cs

Co-authored-by: 0x6273 <0x40@keemail.me>

---------

Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
Co-authored-by: 0x6273 <0x40@keemail.me>
 2025-01-19 11:48:58 -08:00
github-actions[bot]
2894f49c4c Update Credits (#34507) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2025-01-19 15:54:27 +01:00
Tezzaide
a83fd7b916 Fixed minor spelling mistake in Noir Trenchcoat description. (#34519) 
Update coats.yml
 2025-01-19 14:34:46 +01:00
Alfred Baumann
bf59371656 Add Airlocks with Bar and Kitchen access (#33821) 
* Add kitchen access to Bar-Cafeteria airlocks on Cog

* Fix merge conflict

* Remove mapping changes

* Add Glass and Maints versions
 2025-01-18 22:42:01 -07:00
TytosB
c917bcc2a9 Cog power setup fix (#34188) 
* many changes

* contentingregrationtests

* serialized invalid removed

* blank

* "Changes and fixes as suggested"

* blank

* blank

* added desk bells

* engi rework rework rework

* added gate to content integration

* tweaks

* aaa

* bbb

* added holopads

* ccc

* Update default.yml

* hotfix

* aaa

* bbb

* many many tweaks and fixes

* aaa

* decals and maints

* aaa

* bbb

* ccc

* cog power setup was bad

* made it artsy

---------

Co-authored-by: Emisse <99158783+Emisse@users.noreply.github.com>
 2025-01-18 22:39:02 -07:00
PJBot
5fb8ebbe61 Automatic changelog update 2025-01-19 05:33:40 +00:00
War Pigeon
b471c1094d CentComm Map Updates (#34475) 
* Bandage fix denied animations playing on devices without them

* CentComm blast door prototype

* CentComm button

* CentComm window shutters

* CC Updates

* Save as grid

* Remove an extra detective figurine

I like them better in the interrogation room

* Remove paramed locker, let pumps shut off

* Fix wrong HOP locker prototype
 2025-01-18 22:32:33 -07:00
PJBot
a2df7719b1 Automatic changelog update 2025-01-19 01:48:01 +00:00
K-Dynamic
2f8f536601 New dry fire sound (#34447) 
* new empty.ogg

* source to tg commit
 2025-01-18 17:46:54 -08:00
PJBot
428fcd65a7 Automatic changelog update 2025-01-18 22:57:48 +00:00
Nox
993b5c46b5 Rarer Highcaps (#34469) 
* Removed highcap from seclite

* Changed cyborg starting battery to highcap, reduced seclite wattage to make it last as long as it used to.

* Gave cyborgs back their medcap

* Rounded seclite wattage down to 0.5
 2025-01-18 14:56:42 -08:00
PJBot
4a015d133d Automatic changelog update 2025-01-18 18:28:54 +00:00
Minemoder5000
1840160fdc Add a 10u vial of plasma to the chemical locker (#33871) 
Add 10u plasma to the chemistry locker so the chemists stop stealing tables.
 2025-01-18 10:27:46 -08:00
PJBot
5d06ee2894 Automatic changelog update 2025-01-18 16:59:59 +00:00
Winkarst
86cf3a46e2 Change MaskComponent to accommodate sprites namings (#33451) 
Co-authored-by: Winkarst <74284083+Winkarst-cpu@users.noreply.github.co>
 2025-01-18 08:58:51 -08:00
Myra
026d65dc43 Staging -> Master merge (#34489) 2025-01-18 16:26:08 +01:00
Leon Friedrich
f3324b458c Update engine to v240.0.1 (#34497) 2025-01-18 16:11:53 +01:00
PJBot
fb38bf3d24 Automatic changelog update 2025-01-18 13:42:36 +00:00
Spessmann
343f59f602 Adds bullet collision to wall mounted cameras (#34500) 2025-01-18 14:41:29 +01:00
PJBot
17464ffe2b Automatic changelog update 2025-01-18 09:03:49 +00:00
ArtisticRoomba
7f0ff0b121 Space lizard plushie can now be worn on your head (#33809) 
* space weh can now be work on top of head

* space weh can now be worn on top of head

* trim out unnecessary comps
 2025-01-18 10:02:40 +01:00
Mono
c78717e4e2 Various Locale Typo Fixes (and spaces) (#34483) 
Random spelling error and FTL linting (+PowersinkSystem because there was an misspelt locale for that)
 2025-01-17 23:37:37 -08:00
Leon Friedrich
c4542ee252 Update engine to v240.0.1 (#34497) 2025-01-18 14:59:53 +11:00
ElectroJr
b13ccfefd6 poke tests 2025-01-18 16:50:50 +13:00
ElectroJr
0d8d50de92 Fix elk and add new test 2025-01-18 16:29:21 +13:00
Partmedia
970b4a687d Improve canister admin logs (#34495) 2025-01-17 17:37:40 -08:00
Leon Friedrich
9d4e60068b Optimize & clean up RadiationSystem (#34459) 
* Optimize & clean up RadiationSystem

* comments

* Update Content.Server/Radiation/Systems/RadiationSystem.GridCast.cs

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>

---------

Co-authored-by: Thomas <87614336+Aeshus@users.noreply.github.com>
 2025-01-18 12:07:20 +11:00
PJB3005
f63eb691f0 Improve canister admin logs. 
1. Now clearly says "opened"/"closed" when changing the release valve.
2. Clearly says whether the valve was opened while a canister was inserted or not.
3. When a tank is ejected, logs if the valve is open and the ejection started spilling into the environment.

Fixes #34488
 2025-01-18 00:51:32 +01:00
PJB3005
0e840d816a Make GasMixture enumerable 
I noticed that enumerating gases is frequently done in an annoying way with Enum.GetValues. So I made it better. Now GasMixture is IEnumerable<(Gas gas, float moles)> and it just works.
 2025-01-18 00:50:22 +01:00
chromiumboy
efd5d644e8 Holopad networking rework (#34112) 
* Initial commit

* Finalizing main changes

* Addressed reviews

* Fixed a few issues

* Switched to using global overrides

* Removed unnecessary references
 2025-01-17 14:09:59 -06:00
PJBot
464f68dad0 Automatic changelog update 2025-01-17 17:27:12 +00:00
Tobias Berger
2fa4f0a286 Update nix flake for .NET 9 (#34480) 2025-01-17 18:26:04 +01:00
Pieter-Jan Briers
b07fe8ee10 Staging: Add taped logo back for 10th anniversary (#34486) 2025-01-17 18:22:42 +01:00
ElectroJr
dc13744188 Merge branch 'master' of https://github.com/space-wizards/space-station-14 into map-load-refactor 2025-01-18 04:14:18 +13:00
Minemoder5000
50bb5e0c13 Replace the djstation intercoms with freelance intercoms (#34478) 
* Add Freelance intercom prototype, and replace the djstation ruin with them instead of three master keys

* removed a new line
 2025-01-17 14:01:06 +01:00
PJBot
ac04604b8a Automatic changelog update 2025-01-17 11:36:10 +00:00