Skip to content

Commit

Permalink
Upstream patch 2402 pt.2 (#798)
Browse files Browse the repository at this point in the history
* Apply RoofOverlay Per-Grid Not Per-Map + Fix Lighting Quality (#35207) (#1829)

high lighting quality is no longer fucked

:cl:
- fix: Ported fix for high lighting quality

Co-authored-by: metalgearsloth <[email protected]>
(cherry picked from commit 18db87241695094c2ea5bda87b239041cfbfc151)

* Scroll to Bottom when Selecting a New Chat (#1814)

Previously, NanoChat set you to the "center" of your chat box scroll
with selecting a new chat. This fixes that.

:cl:
- tweak: NanoChat will now scroll to the bottom of your chat history
when selecting a new chat.

(cherry picked from commit 2772114f5dac865da4b5ccbbcd94c8ad47c7b5d2)

* Prevent SecretRule From Picking Invalid Presets (#27456) (#1805)

trying to fix the prelobby heisentest

we use votes anyway! fuck it, we ball

---------

Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: Nemanja <[email protected]>
Co-authored-by: deltanedas <[email protected]>
(cherry picked from commit d5d071a6d974a72357830821364dd906fa4d948d)

* Make Footstep Entity Better (#1809)

# Description

Add some components to the footstep entity to make it be more like the
puddle entity

(cherry picked from commit 3898c65635d2a4236bb6b3ee4cd270f03b66d8d6)

* v245.0.0 (and Storage UI V2) (#1799)

Contains:

- Storage UI v2, required for removing DeferredClose.
- Stock market refactor (mostly some basic changes to stock market,
didn't want to make a whole other PR for it)
- Make guidebook remember where you left off
- Any other PRs are purely for fixing issues related to the above PRs or
the engine update.

:cl:
- add: Ported Storage UI v2.
- tweak: The guidebook will now remember where you left off.

---------

Co-authored-by: Leon Friedrich <[email protected]>
Co-authored-by: DrSmugleaf <[email protected]>
Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: deltanedas <[email protected]>
Co-authored-by: 12rabbits <[email protected]>
Co-authored-by: Pieter-Jan Briers <[email protected]>
Co-authored-by: gluesniffler <[email protected]>
Co-authored-by: AJCM-git <[email protected]>
(cherry picked from commit 3c37ff1c48637d1cdf8bc3c6b1412dad338ea205)

* v246.0.0 + Planet Lighting (#1802)

will do map refactor tomorrow, for now, planet lighting

:cl:
* add: Ported planet lighting for indoor / outdoor areas.
* add: Ported day-night cycle functionality.
* add: Ported some Storage UI v2 fixes.

---------

Co-authored-by: metalgearsloth <[email protected]>
Co-authored-by: DoutorWhite <[email protected]>
Co-authored-by: Janet Blackquill <[email protected]>
(cherry picked from commit 4efb0b3b328dd4eba3095cc3f0a95fad88b49661)

* allow ' in character names (#28652)

(cherry picked from commit 123dfee) and PR #34375

* fix a bunch of cvars

* wonderglue is cheap bonegel, adds biogel as bone gel and makes power drills work as surgery drills

* fix gamemode vote causing a crash for being empty

* disable all non N14 species

* fixed ranger belts not being able to take revolvers

* re-enable run by default

* temporary fix to seed extractor

* disable all non human markings

* Roof data rework (#35388)

(cherry picked from commit a4575511084c1472e677b2dfbd44360de90710ef)

* update weather system to wizden parity

* roof system

* revert back to our own day night system

* fix attributions for luckass n14vault lobby screen

* disable arrivals shuttle

* reduce ghost respawn from 15 to 10 minutes

* disable events for now until we have some

* disable auto preset vote on lobby since we have no presets

* Tile Additions (#652)

(cherry picked from commit ff8aba4)

* disable auto vote system entirely till needed

* enable ooc during rounds

* fix thief missing prototype

* re-add delete organs on gib

* Revert "re-add delete organs on gib"

This reverts commit d2eb71b.

---------

Co-authored-by: sleepyyapril <[email protected]>
Co-authored-by: lzk <[email protected]>
  • Loading branch information
3 people authored Feb 24, 2025
1 parent bd73c1f commit 1b69bac
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Content.Shared/CCVar/CCVars.AutoVote.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public sealed partial class CCVars
{
/// Enables the automatic voting system.
public static readonly CVarDef<bool> AutoVoteEnabled =
CVarDef.Create("vote.autovote_enabled", true, CVar.SERVERONLY);
CVarDef.Create("vote.autovote_enabled", false, CVar.SERVERONLY);

/// Automatically starts a map vote when returning to the lobby.
/// Requires auto voting to be enabled.
Expand Down
2 changes: 1 addition & 1 deletion Content.Shared/CCVar/CCVars.Chat.Ooc.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public static readonly CVarDef<bool>
/// Whether or not OOC chat should be enabled during a round.
/// </summary>
public static readonly CVarDef<bool> OocEnableDuringRound =
CVarDef.Create("ooc.enable_during_round", false, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);
CVarDef.Create("ooc.enable_during_round", true, CVar.NOTIFY | CVar.REPLICATED | CVar.SERVER);

public static readonly CVarDef<bool> ShowOocPatronColor =
CVarDef.Create("ooc.show_ooc_patron_color", true, CVar.ARCHIVE | CVar.REPLICATED | CVar.CLIENT);
Expand Down
2 changes: 0 additions & 2 deletions Resources/IgnoredPrototypes/ignoredPrototypes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
# -----
# Nuclear 14
- /Prototypes/GameRules/cargo_gifts.yml
- /Prototypes/GameRules/events.yml
- /Prototypes/GameRules/midround.yml
- /Prototypes/DeltaV/GameRules
- /Prototypes/Nyanotrasen/GameRules
- /Prototypes/Procedular
Expand Down
56 changes: 56 additions & 0 deletions Resources/Prototypes/_Nuclear14/Tiles/floors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1701,6 +1701,45 @@
heatCapacity: 10000
weather: true

- type: tile
id: N14FloorRoadInnerMiddleWithTop
name: road inner middle with top
sprite: /Textures/_Nuclear14/Tiles/roadinnermiddlewithtop.png
baseTurf: FloorWasteland
isSubfloor: true
footstepSounds:
collection: FootstepFloor
friction: 0.30
thermalConductivity: 0.04
heatCapacity: 10000
weather: true

- type: tile
id: N14FloorRoadOuterTurnSouthTop
name: road outer turn south top
sprite: /Textures/_Nuclear14/Tiles/roadouterturnstop.png
baseTurf: FloorWasteland
isSubfloor: true
footstepSounds:
collection: FootstepFloor
friction: 0.30
thermalConductivity: 0.04
heatCapacity: 10000
weather: true

- type: tile
id: N14FloorRoadOuterTurnWestTop
name: road outer turn west top
sprite: /Textures/_Nuclear14/Tiles/roadouterturnwtop.png
baseTurf: FloorWasteland
isSubfloor: true
footstepSounds:
collection: FootstepFloor
friction: 0.30
thermalConductivity: 0.04
heatCapacity: 10000
weather: true

# Wasteland
- type: tile
id: FloorWasteland
Expand Down Expand Up @@ -1866,3 +1905,20 @@
heatCapacity: 700000
weather: true
indestructible: true

# Swampland
- type: tile
id: FloorSwampland
name: swampland
sprite: /Textures/_Nuclear14/Tiles/swampland.png
variants: 4
placementVariants: [0, 1, 2, 3]
baseTurf: space
isSubfloor: true
footstepSounds:
collection: N14FootstepWater
friction: 0.30
thermalConductivity: 0.04
heatCapacity: 10000
weather: true
indestructible: true
Binary file modified Resources/Textures/_Nuclear14/Tiles/swampland.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 1b69bac

Please sign in to comment.