juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,443 Commits 57 Branches 0 Tags
b9b854e179ccbedc183adfaefc4561dc90cf285a
Commit Graph

31443 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Milon
b9b854e179 ringer bugfixes (#36936) 
AAAAAAAAAA
 2025-04-29 19:08:23 +02:00
keronshb
0a394d4af5 Wizard Teleport Scroll (Teleport Location ECS) (#36424) 2025-04-28 19:42:24 +02:00
Myra
f6bae21184 Cherrypick #36955 into staging (#37002) 2025-04-28 19:40:56 +02:00
Nemanja
d4e40ae44b Revert "Add new color turtlenecks in WinterDrobe" (#36983) 
Revert "Add new color turtlenecks in WinterDrobe (#32920)"

This reverts commit 34cc49c175.
 2025-04-28 19:38:43 +02:00
metalgearsloth
fe3fe95dfa Fix autorecharge 2025-04-28 15:53:40 +02:00
Nemanja
4509821f0e [HOTFIX] Revert "Updated air scrubber and air vent sprites." (#36992) 
Revert "Updated air scrubber and air vent sprites. (#34223)"

This reverts commit 3957bbb97d.
 2025-04-28 11:45:19 +02:00
ScarKy0
14cca7990a [HOTFIX] Fix maroon objective, change the text (#36990) 
* test

* text

* capital C

* guh
 2025-04-28 11:31:42 +02:00
Leon Friedrich
fba07c69a9 Update staging to engine v255.0.0 (#36916) 
Updatee engine to v255.0.0
 2025-04-28 12:11:48 +10:00
themias
bce195b53e Fix disposal unit flush animation (#30677) 
* Fix disposal unit flush animation

* Revert "Fix disposal unit flush animation"

This reverts commit a596ecfd5f5368f87ef52cfb27884a8e000185c6.

* control by setting layer visibility rather than overwriting

* restore changes
 2025-04-24 18:59:39 -04:00
ScarKy0
56ee29ab41 Turnstiles lower volume + access reader (#36900) 
fixes
 2025-04-25 00:14:47 +02:00
Nemanja
abb9e373bd Fix storage ui hovering over the hotbar (#36770) 2025-04-25 00:10:43 +02:00
slarticodefast
2b1161c8a6 Revert "Added warning when attempting to run RUN_THIS on a zip repo download" (#36899) 
Revert "Added warning when attempting to run RUN_THIS on a zip repo download …"

This reverts commit d4c3ff3de4.
 2025-04-24 23:44:28 +02:00
PJBot
407f0d5433 Automatic changelog update 2025-04-24 21:19:33 +00:00
Nemanja
f9b3d59a53 Fix QSI bringing people into paused maps (#36834) 2025-04-24 14:18:26 -07:00
slarticodefast
b3b6d47310 Disable shadows for observer pointlight (#36897) 
no shadows
 2025-04-24 22:42:21 +02:00
Myra
d4c3ff3de4 Added warning when attempting to run RUN_THIS on a zip repo download (#36896) 2025-04-24 22:39:33 +02:00
PJBot
31b5365ae0 Automatic changelog update 2025-04-24 19:48:53 +00:00
ScarKy0
a16504fa42 Tearable Deliveries V2 (#36815) 
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* init or smth

* minor tweaks

* I KEEP MERGE CONFLICTING MYSELF

* comments

* no icon

* slight increase

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* partial review

* message

* review

* pain

* stuff

---------

Co-authored-by: Lmorgan89 <billsmith116@gmail.com>
 2025-04-24 21:47:46 +02:00
Southbridge
6a567cbcb8 Amber Station - Silo (#36764) 2025-04-24 11:24:07 -07:00
PJBot
435affce7e Automatic changelog update 2025-04-24 17:43:03 +00:00
Southbridge
3f588a1bb1 New Spawners, Modified Spawners, new Service/Theatre Airlock, and new Colorful Light Crate (#36750) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-24 10:41:55 -07:00
ScarKy0
9fd5ed6d05 Meta Silo n Dept Economy (#36885) 2025-04-24 10:28:50 -07:00
Nemanja
68881ac030 Fix small misc. turnstile issues (#36893) 
* Fix small misc. turnstile issues

* more missing things

* quieter
 2025-04-24 19:02:12 +02:00
J
1f722bcc44 Delivery system now has the possibility of penalisation (#36660) 
* Add new fields to DeliveryComponent for #36636

* Setting the baseSpesoPenalty for currently available deliveries

* Small fixes

* Basic delivery penalization

* Penalty and reward multiplier calculation in place

Also fixes an issue in SharedCargoSystem when opening a delivery in dev server due to trying to allocate cargo twice.

* Calling penalty no longer happens on opening

* Extract multiplier getting

* Removing unused include

* Changing method description. \n\n Not actually sure what I meant by the first one

* Localising default delivery messages

* Unused include removal

* minor tweaks

* slarti changes

* forgot

* stuffs

* yippee

* Locn't

* doc

* Apply suggestions from code review

---------

Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ScarKy0 <scarky0@onet.eu>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-04-24 18:05:32 +02:00
PJBot
5371dbe9a7 Automatic changelog update 2025-04-24 14:33:18 +00:00
Nemanja
dc9844edd1 Genpop Closets & IDs (#36392) 
* Genpop IDs and Lockers

* placeholder generation, no ui yet.

* UI

* Fix time offset

* fix meta.jsons

* big speller

* Scarkyo review

* Add turnstile prototypes

* make IDs recyclable

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
 2025-04-24 16:32:11 +02:00
PJBot
896f73c59d Automatic changelog update 2025-04-24 11:40:47 +00:00
Nemanja
712954f1c4 Turnstiles (#36313) 
* construction rotation fix

* Turnstiles

* renaming

* review-slarticodefast-1

* mild attempts to fix (sorry sloth)

* move some more shit

* Remove engine dependency

* grid agnostic

* remove debug string

* fix json

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* Update Content.Shared/Movement/Pulling/Systems/PullingSystem.cs

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>

* remove pass delay for mispredict reasons.

* most minor of changes

* Give directional indicator on examine

---------

Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-24 13:39:40 +02:00
Leon Friedrich
0deb35000f Remove beaker from the MaterialArbitrageTest whitelist (#36876) 2025-04-24 11:58:30 +02:00
PJBot
aed40f8e47 Automatic changelog update 2025-04-24 03:46:34 +00:00
SG6732
b0edf7106f Meat Patty (#34896) 
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-23 20:45:27 -07:00
PJBot
cb53647748 Automatic changelog update 2025-04-24 03:25:44 +00:00
Smith
8478125fe8 Cotton Grilled Cheese Sandwich (#36135) 
* Working entity.

* New sprite by MadeOfHeartAndStone

* Removed deadspace, changed attribution in meta.json

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-24 05:24:37 +02:00
Milon
1d14d6b468 fix NoCargoOrderArbitrage fail (#36878) 
whoopsie
 2025-04-24 05:09:59 +02:00
PJBot
408a70f68c Automatic changelog update 2025-04-24 03:02:36 +00:00
RedBookcase
9a646634d4 Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink. (#35915) 
* Removed syndicate surgery duffel, added advanced circular saw to Medical Doctor uplink.

* Update Resources/Prototypes/Entities/Objects/Specific/Medical/surgery.yml

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
 2025-04-24 05:01:29 +02:00
beck-thompson
186cef25ca Put items inside cakes! (#31015) 
* First commit

* I'm silly

* Please be it

* Some more fixes

* Cleanup

* fine!

* removed = false

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
 2025-04-24 05:00:50 +02:00
PJBot
7fded8c8c5 Automatic changelog update 2025-04-24 02:59:00 +00:00
Coolsurf6
b7a0bce4a4 Updated Syndicate and Ammo Contraband (#35102) 
Co-authored-by: RedBookcase <crazykid1590@gmail.com>
 2025-04-23 19:57:53 -07:00
Samuka-C
6ef03b082f Xenoborgs part 1 (#36830) 
Co-authored-by: ScarKy0 <106310278+ScarKy0@users.noreply.github.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
 2025-04-23 19:38:10 -07:00
PJBot
fc50922187 Automatic changelog update 2025-04-24 02:29:41 +00:00
Princess Cheeseballs
dca704c52c Moths can eat pills (#35609) 2025-04-23 19:28:34 -07:00
PotRoastPiggy
82269075bd Adds shorts/pants to ClothesMate vending machine (#35361) 
* Clothesmate shorts

* matches price of vend to the new contents
 2025-04-24 04:12:48 +02:00
PJBot
bb5ea2ff81 Automatic changelog update 2025-04-24 01:22:43 +00:00
No Elka
a8f05f5547 Make toy sword less obvious (#34199) 
* YAML fuckery

* Remove toy_sword.rsi

Not a webedit btw
 2025-04-24 03:21:35 +02:00
PJBot
fa622eac50 Automatic changelog update 2025-04-23 23:56:45 +00:00
Southbridge
a7b2b0bf0f New Salvage Ruin - Hydro Outpost (#36826) 2025-04-23 16:56:31 -07:00
ArchRBX
8045373197 pAI Software Catalog (#36857) 
* initial commit

* add the shop and make it work

* add existing pai actions to the software shop

* added power monitor app

* killed the power and crew monitor software, too powercreepy

* fix test failures

* fix more test failures

* fix merge conflicts

* code changes to conform with review

* fix unintentional submodule update

* submodule update

* remove unused currency prototype ref

---------

Co-authored-by: archrbx <punk.gear5260@fastmail.com>
 2025-04-23 16:55:35 -07:00
Tayrtahn
3313c648fe Fix warnings in ServerDbManager (#36871) 
Fix warnings in ServerDbManager
 2025-04-24 01:48:27 +02:00
Tayrtahn
acee0e53f7 Cleanup warnings in SpawnSalvageMissionJob (#36866) 
* DoMapInitialize and SetMapPaused

* GridTileToLocal

* Formatting

* Remove unused variables

* Update Content.Server/Salvage/SpawnSalvageMissionJob.cs

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

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
 2025-04-24 01:33:30 +02:00