Commit Graph

9706 Commits

Author SHA1 Message Date
Ed
7328f3449c Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream
# Conflicts:
#	Content.IntegrationTests/Tests/EntityTest.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Server/Medical/HealthAnalyzerSystem.cs
#	Content.Server/Procedural/DungeonSystem.Rooms.cs
#	Content.Server/Procedural/RoomFillComponent.cs
#	Content.Server/Procedural/RoomFillSystem.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Storage/EntitySystems/SharedStorageSystem.cs
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/migration.yml
2025-02-16 11:58:47 +03:00
Ed
ffa565484c Modular weapon inlay (#903)
* slots lists

* blade inlay

* tadam
2025-02-16 11:41:43 +03:00
metalgearsloth
b6ee183dc6 Add planet lighting (#32522)
* Implements a Dynamic Lighting System on maps.

* Edit: the night should be a little bit brighter and blue now.

* Major edit: everything must be done on the client side now, with certain datafield replicated.
Changes were outlined in the salvage to accommodate the new lighting system.

* Edit: The offset is now serverside, this makes the time accurate in all situations.

* Removing ununsed import

* Minor tweaks

* Tweak in time precision

* Minor tweak + Unused import removed

* Edit: apparently RealTime is better for what I'm looking for

* Fix: Now the time is calculated correctly.

* Minor tweaks

* Adds condition for when the light should be updated

* Add planet lighting

* she

* close-ish

* c

* bittersweat

* Fixes

* Revert "Merge branch '22719' into 2024-09-29-planet-lighting"

This reverts commit 9f2785bb16aee47d794aa3eed8ae15004f97fc35, reversing
changes made to 19649c07a5fb625423e08fc18d91c9cb101daa86.

* Europa and day-night

* weh

* rooves working

* Clean

* Remove Europa

* Fixes

* fix

* Update

* Fix caves

* Update for engine

* Add sun shadows (planet lighting v2)

For now mostly targeting walls and having the shadows change over time. Got the basic proof-of-concept working just needs a hell of a lot of polish.

* Documentation

* a

* Fixes

* Move blur to an overlay

* Slughands

* Fixes

* Remove v2 work

* Finalise

---------

Co-authored-by: DoutorWhite <thedoctorwhite@gmail.com>
2025-02-16 19:35:32 +11:00
Ed
a3849c8aa9 pressure plate (#902) 2025-02-16 00:39:36 +03:00
Ed
37fd4d887f FIXES 2025-02-15 20:25:04 +03:00
Ed
02379e37f7 Leaf maze demiplane + crayon update (#901)
* crayons update

* Update workbench.yml

* leaf maze demiplane

* Update t2_leaf_maze.yml
2025-02-15 17:49:05 +03:00
Ed
f839ffec0d Update mobs.yml 2025-02-15 15:18:26 +03:00
Ed
4a641c3957 Update guildmaster.yml 2025-02-15 15:03:48 +03:00
Tayrtahn
51a56e013c Separate Udder examine into ExamineableHunger (#35164)
* Separate udder hunger examine into ExamineableHunger

* Fluent grammar improvements

* Add ExamineableHunger to chickens and ducks.

* Use starving message as "dead" message
2025-02-15 05:29:40 +01:00
ArtisticRoomba
ef4f5cf0a1 Engineering guidebook improvements (#34695)
* engineering guidebook improvements

* whoops

* Changes

* this game is en-US, so it shall be gasses, not gases

* make changes to AccessConfigurator.xml, SolarPanels.xml, TeslaEngine.xml

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-02-14 19:59:19 -08:00
Ed
2c5daec98c leaf wall (#900) 2025-02-14 23:14:27 +03:00
keronshb
db732a2581 Supermatter Grenade Rework (#35122)
* Renames Supermatter grenade to singularity grenade. Removes explosion from Singularity Grenade.

* Adjusts Singularity Grenade to account for engine changes, small buff to max range

* Adjusts further

* fix order

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-02-14 16:01:40 +01:00
Ed
a2fa880820 bugg ice shards and add it to loadouts (#899) 2025-02-14 16:19:33 +03:00
Ed
c038c021f8 Bank returns (#898)
* cursed

* update
2025-02-14 14:09:04 +03:00
Nim
249cad63ee fix (#896) 2025-02-14 11:51:10 +03:00
Ed
909dc36158 Spells content (#897)
* modifiers

* counter spell, and 2 new spell scrolls

* Update magical_acceleration.yml

* Update T0_counter_spell.yml
2025-02-14 11:50:57 +03:00
Centronias
12105234fe High Heel Boots do the Clicky Clacky (#35083)
* click clack

* fix quote marks

Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>

---------

Co-authored-by: Errant <35878406+Errant-4@users.noreply.github.com>
Co-authored-by: Hannah Giovanna Dawson <karakkaraz@gmail.com>
2025-02-13 23:35:59 +01:00
Velken
7495081c40 Paramedic Void Suit update (#34657)
* Made paramedic void suit into proper hardsuit (was softsuit before)
Added light to the paramedic void suit helmet
Added siren with light to the paramedic void suit

* Changed paramed helmet flashlight icon and textures

* fixed siren action icon

* BigAction

* updated icon-siren.png

* fixed not being able to add it to containers (like when it parented off eva suit)

* changed light to cyan, made it less brighter and reduced siren volume

* changed ambulancesiren.ogg to a different one (hopefully less hard on the ears)

* created ClothingHeadEVAHelmetWithLightBase in base_clothinghead.yml
replaced ambulancesiren.ogg (again, this time with better fading on the audio loop)
credited myself for the siren icon art
reverted parents to original (but kept it in hardsuits yml, since void suits are light hardsuits) - [ the adoption was revoked 😢 ]
fixed indentations
removed un-used sprite and sprite state

* final final siren sound change (for real this time?)

* fixed license type

* final FINAL final (for real this time, please?) ambulancesiren.ogg change

* ContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainerContainer

* attributions updated (turns out, i have to give myself credit when i make stuff);
fixed identation;
moved action to Action/types.yml.

* hopefully fixed everything this time

* sync shenanigans

* final final final final final for real final ambulancesiren.ogg change pinky promise this time and if you don't like it, make a new PR yourself and offer a new sound

* typo

* done the suggested changes

* cleaning up some forgotten stuff :p

* oops, cleaned up a bit too much

* aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update Resources/Prototypes/Entities/Clothing/Head/eva-helmets.yml

* Update attributions.yml

* evil web edit never again

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: beck-thompson <107373427+beck-thompson@users.noreply.github.com>
2025-02-13 20:52:21 +01:00
Booblesnoot42
be8702ef3f Fix intercom key deletion but for real this time (#34911)
fixes intercom issues
2025-02-13 20:31:33 +01:00
themias
87f2071ba1 Make experimental welding tool less harmful to eyes (#34792)
code
2025-02-13 11:26:01 -08:00
Ed
66a4cbd498 Update Factoria.yml 2025-02-13 22:13:07 +03:00
Viator-MV
4caef5ac74 Factoria added (#893)
* Add files via upload

* Create Factoria.yml

* Update factoria.yml

variantize

* fix

* Update Factoria.yml

* Update Factoria.yml

* fix gravity and atmos

* guards spawnpoints

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-02-13 18:48:26 +03:00
Ed
af83322c90 Glass showcase (#891)
* glass showcase

* fixes

* Update closets.yml

* Update closets.yml
2025-02-13 18:12:17 +03:00
creamybag
90813074f4 Neckerchief (#892)
* neckerchief

* neckerchief№2

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-13 17:24:05 +03:00
Nim
19c29e126d Onion and pepper (#889)
* onion and pepper

* flavor

* crates
2025-02-13 15:21:41 +03:00
Nim
460f438bb2 Various meats (#865)
* meat

* color fix

* recipe

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2025-02-13 11:29:19 +03:00
Smith
3c8fb2e865 Grilled Cheese Sandwich Entity and Recipe (#33807)
* Grilled Cheese Prototype

* Typos

* Removed butter reagent to test flavour changes.

* Flavour corrections.

* CC-BY-SA-3.0 attribution

* Fixing meta.json

* I lost an hour of my life to a missing comma in meta.json

* Merge Conflict Rebase and Test Fixing

* Cook time to 10 seconds.

* Sandwich nutritional balance

* Grilled cheese sprite fixed, found the actual original source for copyright.
2025-02-13 00:00:38 -08:00
Minemoder5000
8f96c77de5 Slime plushie now squishes (#33554)
* Slime plushie now squishes

* Remove useSound
2025-02-13 08:55:04 +01:00
ActiveMammmoth
9fad86342f Wizard Staff of Animation (#34649) 2025-02-12 23:46:02 -05:00
Ed
007249b675 Master fix + Bank removal (#888)
* bugfix

* bank removal

* red and blue carpet

* Update carpets.yml
2025-02-12 22:36:19 +03:00
Ghagliiarghii
859918f1bd light brown fibers (#35111) 2025-02-12 13:41:57 -05:00
Ed
73b4060c65 passport (#886) 2025-02-12 17:20:50 +03:00
Ed
47cb8a0b08 RoomSpawner mask (#33110)
* RoolFill can now spaw rooms with any size

* tile ignoring

* upgrade interior

* simplify

* Update DungeonSystem.Rooms.cs

* center rooms

* Update RoomFillComponent.cs

* Update RoomFillComponent.cs

* Update DungeonSystem.Rooms.cs

* Remove roomfillcoponent from integration test

* Update EntityTest.cs

* remove nullable size, replaced with minsize and maxsize

* clear existing logic refactor

* delete this one
2025-02-12 15:47:48 +03:00
ArtisticRoomba
75727db3a3 Add new freezer atmos devices and fix freezer fixgridatmos marker (#34991) 2025-02-12 18:32:18 +11:00
Nox
129bcdfeb7 Deathsquad revolver ammo fix (#34910)
* Added AP version of mateba, and put it in the deathsquad starting equipment.

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Objects/Weapons/Guns/Revolvers/revolvers.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-11 16:43:10 -08:00
beck-thompson
daad17c97d Add fultons as a T2 research (#34567)
* commit

* fixed
2025-02-11 16:29:13 -08:00
Ed
aa069d1fa7 unrandomize prices (#885) 2025-02-11 23:46:46 +03:00
Terraspark4941
2c728dcca9 Make Advanced Spray more tolerable to use (#34209)
* initial commit

* Fixed the eject order

* FINALLY got a new sprite, its ready to merge!

* I FORGOT THE ATTRIBUTIONS DAMMIT

* Remove extra whitespace

* Sprite update!
2025-02-11 11:05:34 -08:00
Theodore Lukin
7b38a99d23 give CE atmos gas mask (#35063) 2025-02-11 09:48:27 -08:00
metalgearsloth
15b28936df Add loadout names (#31303)
* Add loadout names

Did it for AI, breaking change for pgsql + migrations in general. Nothing atm uses it.

* the box

* Spawning cherry pick

* Fix nit

* revert

* Final cleanup

* Real

* Name UI fix

* Migrations

* a

* Review

* Re-run migrations

---------

Co-authored-by: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
2025-02-11 18:30:24 +01:00
Theodore Lukin
527f4ae6f2 make interrogator lamp security contraband (#35064) 2025-02-11 11:15:13 -05:00
creamybag
ef3629d85d Rework dresses + long leather boots #2 (#882)
* dress finally

* dress, really

* swap layers

* no, that way

* and this one

* fixes and belt remove

* Update general.yml

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
2025-02-11 17:49:59 +03:00
T
0feeaba0bd Increase the price of bulletproof armor. (#34541)
Update cargo_security.yml
2025-02-11 13:17:33 +01:00
War Pigeon
9db50c9ee2 Add additional holiday gear to jobs (#34207)
* Jobs react to more holidays

* Replace taser with Weh auto-injector

* Give cargo techs a box on box(ing) day
2025-02-11 12:47:19 +01:00
qwerltaz
b0cacc7f14 fix conveyor belt default linking (#32688) 2025-02-11 11:44:11 +01:00
deltanedas
5eceaf3e33 Remove batong etc from emagged autolathe (#35014)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-02-11 21:01:59 +11:00
Theodore Lukin
8d51a1fc15 buff python (#33306) 2025-02-11 20:36:45 +11:00
Nox
16149f17a7 Put screwdrivers in the vendomat (#35059)
Increased vendomat Wirecutter stock from 1 to 2. Increased vendomat Screwdriver stock from 0 to 2.
2025-02-11 07:35:05 +01:00
K-Dynamic
1f0d68c24e Grenade resprites part 1, stinger sound change, projectile grenade animation fix (#34421)
* flashbang resprite

* emp grenade resprite

* smoke grenade resprite

* tear gas resprite

* stinger grenade resprite

* adds missing animations for projectile grenades
2025-02-10 19:23:11 -08:00
keronshb
2219487df2 Wizard Fix - Rod Polymorph - Prevent gibbing & slows speed (#34992) 2025-02-10 17:13:17 -05:00