Commit graph

223 commits

Author SHA1 Message Date
Morbo
f0cf42aab3 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Maps/pillar.yml
2022-12-12 18:59:08 +03:00
metalgearsloth
7910bd3ff4
Context steering for NPCs (#12915) 2022-12-12 14:33:43 +11:00
Morb
6ad4a10b29
Repository cleanup (#631) 2022-12-10 12:10:27 -08:00
Morbo
2f1730f64c Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-12-08 08:04:31 +03:00
Kara
8bf0d16fad
Revert "Kicking AFK players (#12812)" (#12909)
This reverts commit ca260ee666.
2022-12-08 01:07:58 +11:00
Morb
37451fc974
Revert "Join min playtime (#604)" (#615) 2022-12-03 05:14:08 -08:00
Morbo
612d79c8fa Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Links/UILinks.cs
#	Content.Server/Entry/EntryPoint.cs
#	Content.Server/IoC/ServerContentIoC.cs
#	Content.Shared/CCVar/CCVars.cs
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/blue.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/orange.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/red.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/light-icon.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/white.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/icon.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/off-inhand-right.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-equipped-HELMET.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-left.png
#	Resources/Textures/Clothing/Head/Hardhats/yellow.rsi/on-inhand-right.png
#	Resources/Textures/Clothing/OuterClothing/Suits/fire.rsi/equipped-OUTERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/atmos.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/ce.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering.rsi/equipped-INNERCLOTHING.png
#	Resources/Textures/Clothing/Uniforms/Jumpsuit/engineering_hazard.rsi/equipped-INNERCLOTHING.png
2022-12-03 07:09:10 +03:00
Pieter-Jan Briers
a6045e4538
Launcher info links. (#12781) 2022-12-02 17:23:43 -08:00
Morbo
f9229d979c Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/Entities/Clothing/Neck/mantles.yml
2022-12-02 06:42:59 +03:00
Morb
d956b8bfcc
Panic bunker min overall playtime & deny reason (#12811)
* Add min overall hours & reason

* Disable show reason by default
2022-12-01 10:41:47 -06:00
Morb
ca260ee666
Kicking AFK players (#12812)
* Kicking AFK players

* Set correct CCvar values
2022-12-01 10:38:20 -06:00
Morb
2409fea950
Join min playtime (#604) 2022-11-29 20:15:56 -08:00
Morb
fb3f24652e
Revert "Revert "Server join queue (#583)"" (#602) 2022-11-29 06:41:12 -08:00
Leon Friedrich
8ec2a9ec74
Ambient sound performance improvements (#12756) 2022-11-28 12:10:40 +11:00
Morbo
8ff7f8344f Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-27 15:24:12 +03:00
Morb
97973e2ed9 Revert "Server join queue (#583)"
This reverts commit 84605eacb8.
2022-11-27 04:09:27 -08:00
Leon Friedrich
2dc7663d1a
Remove explosion networking jank (#12733) 2022-11-27 21:24:35 +11:00
Morb
84605eacb8
Server join queue (#583) 2022-11-25 23:38:46 -08:00
Morbo
2d73068f9a Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-10 09:40:37 +03:00
Kevin Zheng
5ba034ad36
Add automatic emergency shuttle call (#12473)
* Add automatic emergency shuttle call

This adds a cvar shuttle.auto_call_time which is an integer N, that
calls the emergency shuttle automatically without intervention after N
minutes. This can be disabled by setting N to 0.

After a vote to extend, the shuttle will be called automatically every
shuttle.auto_call_extension_time minutes.

* Update Resources/Locale/en-US/round-end/round-end-system.ftl

Co-authored-by: theashtronaut <112137107+theashtronaut@users.noreply.github.com>

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: theashtronaut <112137107+theashtronaut@users.noreply.github.com>
2022-11-09 22:20:36 -06:00
Morbo
85a75100e9 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Prototypes/GameRules/events.yml
2022-11-08 06:12:45 +03:00
Mervill
40b556d206
Refactor GameMapManager a bit (nukes mapforced) (#11513)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Closes https://github.com/space-wizards/space-station-14/issues/7192
Closes https://github.com/space-wizards/space-station-14/issues/6537
Closes https://github.com/space-wizards/space-station-14/issues/9579
2022-11-08 13:18:21 +11:00
Morbo
bfa402a3e6 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-11-05 06:14:39 +03:00
theashtronaut
2856213c80
Add lobby music volume slider (#12153) 2022-11-04 11:15:37 +11:00
Morbo
06399f4e51 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Resources/Textures/Objects/Tools/welder.rsi/icon.png
#	Resources/Textures/Objects/Tools/welder_experimental.rsi/icon.png
#	Resources/Textures/Objects/Tools/welder_experimental.rsi/welder_flame.png
#	Resources/Textures/Objects/Tools/welder_industrial.rsi/welder_flame.png
#	Resources/Textures/Objects/Tools/welder_industrialadv.rsi/welder_flame.png
2022-11-02 04:55:26 +03:00
Rane
88186f2106
Map pool cvar (#12313)
* it just works

* nuke votable

* whoops
2022-11-01 20:17:35 -05:00
Morbo
8ffba84896 Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-21 19:51:57 +03:00
Kara
3fd226d9f0
Extended rework & ramping event scheduler (#11362) 2022-10-18 19:51:47 -07: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
Flipp Syder
a3dafd88dc
Oldchat (#11913)
* attempt at moving MainViewport to UIWidget

* oldchat (prototype)

* separate oldchat and default ss14 HUD into their own files

* restores original default game screen logic and adds that logic into separated chat game screen

* hand reloading, several tweaks to port oldchat to main ss14 branch

oldchat is currently not selectable

* screen type cvar, gameplay state screen reloading/loading

* reload screen on ui layout cvar change

* fixes up basic reloading (HUD switching is still very bad)

* some UI widget reloading for main UI screen switching

* alert sync on screen change

* inventory reload

* hotbar margin fix

* chat bubbles above viewport

* whoops

* fixes ordering of speech bubble root

* should fix the chat focus issue (at least in-game, not lobby yet)

* should fix up the lobby/game chat focus

* fixes chat for lobby, turns lobby into a UI state

* viewport UI controller

* viewport ratio selection

* whoops

* adds the /tg/ widescreen ratio

* removes warning from inventory UI controller, adds background to separated chat game screen's chat portion

* menu button reload

* unload menu buttons only from gameplay state shutdown

* bugfix

* character button fix

* adds config options for viewport width/UI layout

* variable naming changes, get or null instead of get to avoid exceptions

* moves entity system get into controller
2022-10-17 17:13:41 -05:00
Morbo
ae8cb2688c Merge remote-tracking branch 'upstream/master' into upstream-sync 2022-10-14 07:21:01 +03:00
Kara
ff448d2778
Disable restart vote as hotfix (#11878) 2022-10-12 17:55:42 -07:00
Jezithyr
571dd4e6d5
Hud refactor (#7202)
Co-authored-by: DrSmugleaf <DrSmugleaf@users.noreply.github.com>
Co-authored-by: Jezithyr <jmaster9999@gmail.com>
Co-authored-by: Jezithyr <Jezithyr@gmail.com>
Co-authored-by: Visne <39844191+Visne@users.noreply.github.com>
Co-authored-by: wrexbe <wrexbe@protonmail.com>
Co-authored-by: wrexbe <81056464+wrexbe@users.noreply.github.com>
2022-10-12 10:16:23 +02:00
Alex Evgrashin
7d882f22c9
Radiation rework (#10970) 2022-10-11 14:09:10 +11:00
Morbo
ee06a9e19a Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Shared/Interaction/SharedInteractionSystem.cs
#	Resources/Locale/en-US/job/job-names.ftl
#	Resources/Prototypes/Datasets/Names/revenant.yml
#	Resources/Prototypes/Entities/Structures/Machines/gravity_generator.yml
2022-10-07 18:01:36 +03:00
metalgearsloth
ca3f5bef59
Fix saltern cvar (again) (#11695) 2022-10-04 15:58:49 +11:00
metalgearsloth
600c0e3255
Fix a few warnings (#11576) 2022-10-04 14:24:19 +11: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
Morb
b49688dc01
Награды спонсорам (#402) 2022-09-19 11:16:58 -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
AJCM-git
03cc0508f3
Automatically TitleCase IC names (#10986) 2022-09-14 19:50:15 +10:00
Moony
85389dab55
no more MRP sandbox. (#11236)
goobye
2022-09-12 20:47:59 -05:00
Visne
0a3cf8325f
Add embeds to AHelp relay (#11184) 2022-09-11 08:43:38 -07: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
Flipp Syder
3cfa00e91c
Flavor profiles (#10991)
* flavor profiles

TODO: every single flavor! yeah!!!

* adds basic localization, and flavors/lastFlavor values for when you get the flavor profile message

* multiple and single flavor messages

* start on flavor localization, multiple flavors in localized flavors

* flavor prototypes

* a few more flavors, descriptions on what each section of the flavor file should be doing

* localization for flavor profiles in drink/food system

* adds an event that allows a flavor profile list to be transformed base on the user entity

* raises it on the food entity too

* changes a field in flavor, adds some more flavors, starts adding flavor prototypes

* adds basic flavors to several entities, and consumable drinks, renames flavor field to 'flavors'

* changes call ordering in flavorprofile, adds flavor to ignored components server-side

flavor is really just a popup message, and those are all processed server-side

* fixes where food tried to get the flavor of the user instead of the food

* single flavors will now get the localized string

* getting the flavor message now ensures that flavors are deduplicated

* makes flavor processing more strictly unique bu making everything hashsets

* yeah, that could just not have distinctby now

* adds flavorprofile directly to food base instead for generic food taste

* FlavorProfileModificationEvent now passes a hashset of strings and not flavorprototypes

* flavorprofilesystem now broadcasts the flavor profile modification event

* adds more flavors to the flavor profile loc file

* skips a flavor, if the flavor string is null/empty

* adds some more flavors, adds generic medicine flavor to medicinal chemicals

* more food flavors, adds flavors to swallowing

* adds some cocktails to the set of flavor profiles

* regenerates flavor prototypes

* adds flavor type to all flavors, adds whitespace between variants

* adds more flavors, adds flavors to several chemicals and food items

this is the part that took the longest

* changes backup flavor message

* spelling mistake

* more flavors, and flavors on food

* readds all the type fields, whoops

* fixes localization strings for forcefeeding food/drink

* fixes multiple flavor profile

* adds flavor limit for flavors

* makes that fetch the cvardef instead
2022-09-08 18:14:49 -05:00
Morbo
59de757713 Merge remote-tracking branch 'upstream/master' into upstream-sync
# Conflicts:
#	Content.Client/Doors/AirlockVisualizer.cs
#	Resources/Prototypes/Entities/Structures/Wallmounts/air_alarm.yml
#	Resources/Textures/Structures/Doors/Airlocks/Glass/external.rsi/closed_unlit.png
#	Resources/Textures/Structures/Doors/Airlocks/Standard/external.rsi/closed_unlit.png
2022-09-06 22:21:16 +03: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
metalgearsloth
0286b88388
NPC refactor (#10122)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10:00
Kara
42d146effa
Mapping autosaves (#10966) 2022-09-03 06:39:28 -07:00