Commit Graph

25373 Commits

Author SHA1 Message Date
Jaraten
26f91c3a5a resprite tiles (#163) 2024-05-21 15:50:37 +03:00
Jaraten
82013c2be1 Wooden Window Fix (#162) 2024-05-21 11:54:45 +03:00
Ed
f9394f4da2 Update PULL_REQUEST_TEMPLATE.md 2024-05-21 11:48:56 +03:00
Ed
18e4e86b21 Ed 19 05 2024 building2 (#161)
* added wooden planks from wooden logs

* update construction crafts from new wood planks

* Update simple.yml

* add wall frame and wall construction graph

* noSpawn old planks, fix wooden frame layering

* update Jaraten sprites

* add wooden window and restruct files

* fix

* Update wall.yml

* add new walls!

* restruct wallmounts, fix bugs

* door fix

* Update walls.yml

* Update simple.yml
2024-05-21 00:07:51 +03:00
Ed
dbff4c1397 Merge pull request #159 from crystallpunk-14/ed-19-05-2024-upstream
Ed 19 05 2024 upstream
2024-05-19 17:20:56 +03:00
Ed
1dbb4e7e94 Merge branch 'master' into ed-19-05-2024-upstream 2024-05-19 15:57:20 +03:00
Ed
6a639107b3 Merge remote-tracking branch 'space-station-14/master' into ed-19-05-2024-upstream
# Conflicts:
#	Resources/Prototypes/Entities/Structures/Walls/asteroid.yml
2024-05-19 15:43:25 +03:00
Ed
1ce32bd1c7 Logs + fireplace fix + Trees (#158)
* add wooden log stacks

* setup wood material

* update trees

* fix fireplaces

* stack now properly works in fireplace system

* bonfire fix

* Update materials.yml

* Update base.yml
2024-05-19 15:40:28 +03:00
Leon Friedrich
6e83c4d570 Update component query benchmarks (#27967)
* Add more component query benchmarks.

* Rename benchmark
2024-05-19 11:55:10 +10:00
Leon Friedrich
b4a5399ad4 Modify battery assert to avoid floating point errors (#28007) 2024-05-19 11:54:52 +10:00
PJBot
e5f30b12d2 Automatic changelog update 2024-05-19 01:36:52 +00:00
DrSmugleaf
3d41d5f2bc Make wielding automatically drop the item on your other hand (#27975)
* Make wielding automatically drop the item on your other hand

* Fix docs

* Remove redundant parameter

* Fix not deleting virtuals on fail

* Make count freeable hands method

* Add popup when dropping item
2024-05-18 18:35:46 -07:00
github-actions[bot]
676fc22eb4 Update Credits (#28124)
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
2024-05-19 03:33:41 +02:00
PJBot
74e853ee7d Automatic changelog update 2024-05-19 00:24:50 +00:00
dffdff2423
9f1d95e335 Fix Flavor Text editor not saving correctly (#28122)
* Check for flavor text equality in profile.

* Fix some characters being deleted from flavor text

Sometimes the last few characters of the flavor text would get deleted. This fixes this issue.
2024-05-19 02:23:44 +02:00
Tayrtahn
22aa8596de Fix activatable UI popup message spam (#28123)
Fixed activatable UI popup message spam
2024-05-18 17:12:47 -07:00
Ed
13d104c0de update ladder color 2024-05-19 00:44:37 +03:00
Ed
b66ce952af Minecraft update (#157)
* add shovel and digging tool quality

* dirt digging effect

* variantize deconstructed tile

* added dirt tile borders

* revert variantize tiles, add dirt blocks entity

* add dirt stack

* Update simple.yml
2024-05-19 00:26:52 +03:00
Ed
fc11cc90ac Revert "Tile variantize after deconstruct" (#28119)
Revert "Tile variantize after deconstruct (#28118)"

This reverts commit bf0529df56.
2024-05-18 23:23:40 +03:00
Ed
bf0529df56 Tile variantize after deconstruct (#28118)
Update TileSystem.cs
2024-05-18 15:06:36 -04:00
Tayrtahn
bad3bb4a89 Random book story generator refactor (#28082)
* Randomized book overhaul

* Fix prototype names

* Improved setting paper content

* Praise Ratvar
2024-05-18 12:20:00 -04:00
Ed
225a05ecdb Nuke spaceshroom ore (#28110)
nuke spaceshroom ore
2024-05-18 12:17:46 -04:00
Ed
8c7f26f860 Overworld biome overhaul (#156)
* decals filter adding

* add planet generation!

* Update biomes_template_grasslands.yml
2024-05-18 18:06:53 +03:00
Tornado Tech
0aa0abb949 New tiefling hue (#155)
* Добавлен отдельный тип цвета кожи для тифлингов

* Немного чистки

* Автоматом поправил, будет мешать при мердже
2024-05-18 17:46:19 +03:00
PJBot
8bbd2394ef Automatic changelog update 2024-05-18 14:24:24 +00:00
double_b
0525c63332 Resolves Bible summon message being sent to all users (#28104)
* Changed PopupEntity overload used to ensure message is only sent to user

* Updated uid for PopupEntity call

* Updating _popupSystem.PopupEntity call in AttemptSummon
2024-05-18 10:23:16 -04:00
Ed
9690077532 Bloodgrass gatherable entity + gatherable system cleanup + bugfix (#154)
* added 4 basic reagent effects

* entrance bugfixes

* add bloodgrass world sprites

* preuso cherry pick

* add planet bloodgrass and sickle gathering

* +1 gather sound
2024-05-18 15:16:20 +03:00
lzk
37382b3186 Move pens out of paper.yml mess (#28044)
* Move pens out of paper.yml mess

* forgor

* fix tests

* fux

* fix 2
2024-05-18 12:51:02 +03:00
PJBot
ca96a27c31 Automatic changelog update 2024-05-17 19:47:51 +00:00
YuNii
99072341eb Add keybind option for the Emote Menu (#28083)
* Add keybind option for the Emote Menu

* Update .editorconfig

oopsies
2024-05-17 21:46:45 +02:00
PJBot
6082df7eac Automatic changelog update 2024-05-17 16:34:28 +00:00
lzk
b08f79fb38 Move replacement chance from ReplacementAccentComponent to ReplacementAccentPrototype (#28049)
Move replacement chance to ReplacementAccentPrototype
2024-05-17 19:33:22 +03:00
Ed
a29034a133 tile filter (#153) 2024-05-17 18:16:14 +03:00
Ed
811cc8a41d Underworld + Overworld (#151)
* Setup new dungeon system (v2)

* add custom basic generation

* add maps linking

shitcode, boo

* add auto linking sub-world portal

* fix deleted component

* clearing otherside of the tiles manually (im stuck in wall, brother!)

* Upgrade cave biome generation

* add TODO

* add ladder and hole sprites

* add dungeon entrance prototypes

* clean up, add docs

* add many ambient sounds

* Update CP14StationDungeonMapSystem.cs

* remove bugs
2024-05-17 17:07:29 +03:00
Ed
a2c164bb07 Merge pull request #152 from crystallpunk-14/ed-17-05-2024-upstream
Ed 17 05 2024 upstream
2024-05-17 13:07:44 +03:00
Ed
918ba35ccb Merge remote-tracking branch 'refs/remotes/upstream/master' into ed-17-05-2024-upstream 2024-05-17 12:57:04 +03:00
DrSmugleaf
de7e1b33dd Add data field for id card microwave behaviour (#28087) 2024-05-17 10:48:22 +02:00
PJBot
fd8b195c4e Automatic changelog update 2024-05-17 07:52:35 +00:00
Nemanja
868b6c202d fix orphaned storage grid pieces getting stuck to the cursor (#27960)
* fix orphaned storage grid pieces getting stuck to the cursor

* instead of denying it, update it smartly
2024-05-17 00:51:28 -07:00
Emisse
157c57a94f bagel update (#28080) 2024-05-17 00:15:52 -06:00
Pieter-Jan Briers
7ddd0979a4 Update engine to v222.3.0 (#28078)
* Update engine to v222.3.0

* v222.4.0 instead
2024-05-17 06:12:13 +02:00
PJBot
0a9ac37fcc Automatic changelog update 2024-05-16 20:52:13 +00:00
deltanedas
b453b94148 fix ninja hacking not affecting sechud (#28021)
minor refactor and fix

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-05-16 16:51:06 -04:00
Джексон Миссиссиппи
893b60dba9 Make some CCVars server-change only (#28079)
* | CVar.SERVER

* Ooh ee ooh aah aah ting tang walla walla bing bang
2024-05-16 21:44:20 +02:00
Pieter-Jan Briers
b35dc427e1 Fix sandbox check failure when compiling with latest .NET SDK. (#28077)
Roslyn now compiles char + string with string.Concat(ROS<char>). This means doing ref char -> ROS<char> which is not sandbox safe. Actually fixing this in the sandboxer is difficult so I'm gonna just pass on that for now.
2024-05-16 19:55:32 +02:00
Errant
6c5b84a346 Remove throngler lottery mention from Tips (#28073)
You sit on a throne of lies
2024-05-16 13:53:46 +03:00
DrSmugleaf
e53f225a39 Move most rotting code to shared (#28050)
* Move most rotting code to shared

* Remove unused dependency
2024-05-15 17:45:50 -04:00
PJBot
91afb12993 Automatic changelog update 2024-05-15 21:04:04 +00:00
EdenTheLiznerd
f3910d3410 Remove The Throngler from Grand Lottery (#28060)
Peace and Quiet
2024-05-15 23:02:58 +02:00
Dexler
9b5dd1fab2 Disposal unit recharging state fix (#28059) 2024-05-15 16:55:01 -04:00