NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-18 06:31:14 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 16
14746 commits 14 branches 0 tags 2.9 GiB
Commit graph

135 commits

Author SHA1 Message Date
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
513e6cf6ef Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	.github/CODEOWNERS
#	Content.Server/Chat/Managers/ChatManager.cs
 2022-11-25 04:31:52 +03:00
metalgearsloth
6c76061887
Content changes for mapgrid kill (#12567) 2022-11-22 13:12:04 +11:00
Leon Friedrich
6917b0fe17
Misc audio and related changes for replays (#12578) 2022-11-22 11:49:48 +11:00
Morbo
c186e00d25 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-11 17:58:06 +03:00
Leon Friedrich
3a0c3b02b3
Firelock fixes (#12542) 
* Firelock fixes

* review
 2022-11-10 22:21:01 -06:00
Morbo
d7d2dd96c0 Merge remote-tracking branch 'upstream/master' into upstream-sync2 
# Conflicts:
#	Content.Client/PDA/PDAMenu.xaml
#	Content.Server/GameTicking/GameTicker.RoundFlow.cs
#	Content.Server/GameTicking/GameTicker.Spawning.cs
#	Content.Shared/Humanoid/NamingSystem.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/icon.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Coats/detective.rsi/meta.json
 2022-11-09 03:02:01 +03:00
Moony
8d56f7d875
guh (#12474) 
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2022-11-08 14:10:31 -06:00
Leon Friedrich
8620899a4a
Fix firelock danger indicators (#12327) 
* Fix firelock danger indicators

* remove unused arg
 2022-11-08 13:55:45 -06:00
Morbo
3af5b83703 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
 2022-10-18 21:23:46 +03:00
0x6273
fe00c1c10b
Airlock bolt and deconstruction fixes (#11985) 2022-10-17 11:44:04 +11:00
Leon Friedrich
bb61eb7f54
Move board spawning out of DoorSystem (#11772) 2022-10-17 03:43:33 +11:00
Leon Friedrich
94c9c9a45c
Improve FirelockSystem performance (#11958) 2022-10-16 20:14:18 +11:00
Morbo
57d8a459bb Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/Sex.cs
#	Resources/Prototypes/Roles/Jobs/Civilian/librarian.yml
 2022-10-16 02:03:26 +03:00
metalgearsloth
0b38589728
Raise power events by ref and not broadcast (#11923) 
Also some other minor stuff.
 2022-10-14 23:08:15 -05:00
Morbo
7fa98d7e4d Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	README.md
#	Resources/Prototypes/Roles/Jobs/Cargo/quartermaster.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
 2022-09-30 17:57:03 +03:00
metalgearsloth
f456ad911e
Pathfinder rework (#11452) 2022-09-30 14:39:48 +10:00
Morbo
a301bf012b Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Shared/Humanoid/Prototypes/SpeciesPrototype.cs
 2022-09-23 16:31:55 +03:00
Flipp Syder
3d3de873ff
Adds a power check to OnAtmosAlarm for firelocks (#11369) 
* firelocks when alarmed will now use tryclose instead of emergencypressurestop

* just adds a power check to OnAtmosAlarm, instead

* restores emergencypressurestop usage, adds a newline to an if
 2022-09-16 22:34:52 -07:00
Morbo
143d408c81 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml
#	Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
 2022-09-16 19:22:52 +03:00
metalgearsloth
78a4ab6eb2
Update for collision events by-ref (#10933) 2022-09-14 17:26:26 +10:00
Morbo
9aa9539fe8 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Content.Client/Entry/EntryPoint.cs
 2022-09-11 14:26:08 +03:00
Visne
94178804df
Keep windoors open if they are clicked (#11180) 2022-09-11 07:48:03 +10:00
Morbo
3c918a374b Fix AirlockVisualizer 2022-09-06 22:22:09 +03:00
Leon Friedrich
35a142965d
Firelock ECS + some other stuff. (#8366) 
* firelock rejig

* dont error failed resolves

* fix

* less resolves

* switch fire and pressure messages

* update

Co-authored-by: wrexbe <wrexbe@protonmail.com>
 2022-09-05 22:55:33 -07:00
Flipp Syder
8cbcf2d640
Fixes reset propagation for atmospheric alarm receivers, adds CVar for fire alarm all access (#11020) 
* adds a check for if a firelock is powered before auto-opening

* fixes issue where resets would not propagate properly

* adds cvar bound for fire alarm access (defaults to all access)
 2022-09-05 18:15:50 -07:00
corentt
6301ac5147
AirAlarms fixes (#11062) 
* modify airalarm thresholds

* display percentage, not ratio

* reopen doors on normal/warning state

* panic mode on danger state
 2022-09-05 19:54:26 -05:00
Flipp Syder
ba2995b7c8
Merge pull request #10721 from vulppine/air-alarm-fixup 
Air sensors & air alarm fixup
 2022-09-02 13:00:33 -07:00
Rane
822c8f3c70
make jaws of life not awful (#10770) 2022-08-31 20:22:25 -07:00
vulppine
e0bf77490d number of things, fixing warnings, AtmosAlarmType instead of AtmosMonitorAlarmType 2022-08-29 07:37:26 -07:00
Leon Friedrich
35475bac55
Partial kudzu fix (#10854) 2022-08-25 23:34:05 +10:00
Flipp Syder
f00a5cb17a
Merge branch 'master' into air-alarm-fixup 2022-08-23 13:21:05 -07:00
vulppine
df25715ed3 renames AtmosMonitorAlarmEvent to AtmosAlarmEvent 2022-08-23 10:42:03 -07:00
TekuNut
b80708e7cc
Fix xenos prying doors from afar (#10778) 2022-08-23 20:31:54 +10:00
vulppine
901670c2ea firelocks now check if the alarms they have are null or not before autoclosing 2022-08-22 16:58:58 -07:00
vulppine
7fd510d252 power check for firelocks, atmos monitor power cycle should now alert 2022-08-22 16:47:34 -07:00
vulppine
069ea2e315 autocloses firelocks 2022-08-22 16:33:13 -07:00
vulppine
d712b1b744 whoops!!! 2022-08-22 16:10:50 -07:00
vulppine
6be3265084 tag sync, replaces monitor references with alarmable references 2022-08-22 05:49:51 -07:00
Leon Friedrich
c7ad6b709e
Audio System Rejig (#9635) 2022-07-29 12:13:12 +10:00
Flipp Syder
fab5aed3b8
Fixes power wire action electrocution (#8520) 2022-07-24 21:53:30 -07:00
Vera Aguilera Puerto
aa9281d667
Refactors the AtmosphereSystem public-facing API to allow for multiple atmos backends. (#8134) 
* Refactors the entirety of the AtmosphereSystem public-facing API to allow for multiple atmos backends.

* actually compiles

* Remove commented out code

* funny bracket

* Move archived moles, temperature from GasMixture to TileAtmosphere.

* WIP customizable map default mixture
still VERY buggy

* broken mess
aaaaaaaaaaaaa

* Fix lattice, etc not being considered space

* visualization for "IsSpace"

* help

* Update Content.Client/Atmos/Overlays/AtmosDebugOverlay.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Holy SHIT it compiles AGAIN

* Fix AtmosDeviceSystem crash at shutdown

* Fix immutable tiles on map blueprints not being fixed by fixgridatmos/revalidate.

* Use space instead of gasmixture immutable for heat capacity calculations

* Remove all LINDA-specific code from GasMixture, move it to TileAtmosphere/AtmosphereSystem instead.

* Fix roundstart tiles not processing

* Update Content.Server/Atmos/Commands/SetTemperatureCommand.cs

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Update Content.Server/Atmos/EntitySystems/AtmosphereSystem.API.cs

Changed Files tab is so large I can't commit both suggestions at once mfw

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2022-07-04 09:51:34 -05:00
metalgearsloth
f0cc636c1d
Add door prying to xenos (#8917) 
* Add door prying to xenos

* a

* c
 2022-06-28 20:50:58 +10:00
metalgearsloth
521ed99766
Evac shuttle (#8931) 
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
 2022-06-26 15:20:45 +10:00
metalgearsloth
c243edbf33
Make doorbumps quiet (#8812) 2022-06-15 15:14:15 +10:00
keronshb
f7b1bda3e5
Reorders Sound Systems signatures to match Popup Systems. (#8728) 2022-06-13 09:45:47 +10:00
metalgearsloth
093d65e92a
Hotfix door bumps (#8665) 
Co-authored-by: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
 2022-06-12 11:15:53 +10:00
Leon Friedrich
ca7960382b
Missing nullables (#8634) 2022-06-04 17:17:48 +10:00
keronshb
d5620aa833
AccessReader IsAllowed use resolve (#8527) 2022-06-01 08:26:50 -07:00
metalgearsloth
01d2d174fc
Pathfinder hotfixes (#8201) 2022-05-16 13:21:00 +10:00