juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
26,463 Commits 57 Branches 0 Tags
82f1ed14935fa7e239d40fecd0bfe93b88ef1914
Commit Graph

26463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jaraten
82f1ed1493 upd cliffs (#320) 
* upd cliffs

* localize

* Update marker_base.yml

* Update entities.ftl

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-07-09 21:31:36 +03:00
Ed
ba03872c57 Expedition goals (#318) 
* forgot this one

* disable dinosaurus

* expedition collect objective condition

* Update CP14ExpeditionSystem.cs

* add expedition objectives

* auto-issue of objectives to all expedition participants

* delete cp14playtest gamemode

* Update CP14ExpeditionObjectivesRule.cs
 2024-07-09 08:31:24 +03:00
Ed
f42546e0c6 Some round beginning preparation (#317) 
* gamepresets filter

* addgamerule cp14 filter

* shuttle dropping

* long time FTL

* FTL map tweaks

* Update ShuttleSystem.FasterThanLight.cs

* handle player ship spawning (not tested yet)

* typo

* test elemental shit (ship)

* player spawn handling (real this time)

* FTL map gravity

* clean up 1

* clean up 2

* instant FTL

* Update CP14ExpeditionSystem.cs
 2024-07-08 17:39:04 +03:00
ravage
451d04d759 Add beards (#312) 
* :neckbeard:

borodi

* :neckbeard: v2

a
 2024-07-08 14:21:56 +03:00
KittenColony
5ae2590667 removed Goblin lastname (#314) 2024-07-07 21:00:02 +03:00
Ed
8e1547e616 Update attributions.yml 2024-07-07 14:06:48 +03:00
Ed
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Ed
b6d6e2de8c haha! 2024-07-06 12:19:32 +03:00
Ed
b4b63ed898 revert sublicense, its not working 2024-07-06 12:08:50 +03:00
Ed
d9ed4a63df sublicense 2024-07-06 11:56:18 +03:00
Ed
f8b6bc7243 Update battle_royale.yml 2024-07-06 11:27:38 +03:00
Ed
205aae364c Battle royale playtest map (#309) 
* setup balance

* more preparation

* Update arenas.yml

* Update battle_royale.yml

* pop

* Update arenas.yml
 2024-07-06 11:22:36 +03:00
Ed
cc9e5f68da Update entities.ftl (#307) 2024-07-05 14:00:56 +03:00
Ed
01f97a8aaa +3 berets (#306) 2024-07-05 08:56:38 +03:00
Ed
d9fc93e0c5 +2 lobby track (#304) 2024-07-04 23:35:53 +03:00
Ed
3182447fbf Grass update v2 (#303) 
* high bush

* update worldgen
 2024-07-04 23:25:22 +03:00
Ed
9280ca8830 Merge pull request #301 from crystallpunk-14/ed-05-07-2024-upstream 
Upstream sync
 2024-07-04 19:46:27 +03:00
Jaraten
b7e2d66557 wood&paper walls (#299) 2024-07-04 19:46:10 +03:00
Jaraten
a9cb687899 resprite decals (#302) 2024-07-04 19:45:24 +03:00
Ed
b1a2aaf1f5 remove vox 2024-07-04 18:25:23 +03:00
Ed
bd011bf418 Merge remote-tracking branch 'upstream/master' into ed-05-07-2024-upstream 
# Conflicts:
#	Content.IntegrationTests/Tests/Round/JobTest.cs
#	Resources/Prototypes/Traits/speech.yml
 2024-07-04 18:14:21 +03:00
Ed
38cd8ad6a1 Fix Vox clothing in character creation menu (#29709) 
Update vox.yml
 2024-07-04 22:55:00 +10:00
Brandon Hu
96ff998d18 fix(packed): Fix a couple of issues (#29422) 
* fix(packed): Fix a couple of issues

* Name the signal button for bar
 2024-07-04 03:02:02 -06:00
Brandon Hu
fb9c03186c fix(marathon): Fixing more issues (#29411) 2024-07-04 03:01:31 -06:00
PJBot
2cf42bf7a4 Automatic changelog update 2024-07-04 08:03:49 +00:00
Pieter-Jan Briers
8d015f5c9f Fix animation looping bugs. (#29457) 
Summary of the problem is in the corresponding engine commit: a4ea5a4620

This commit requires engine master right now.

I think #29144 is probably the most severe one, but I touched Jittering and RotatingLight too since they seemed sus too.

Fixes #29144

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-07-04 18:02:43 +10:00
PJBot
bc7907728c Automatic changelog update 2024-07-04 07:18:53 +00:00
JIPDawg
1471bd5b53 Added Health Analyzer to basic treatment module. (#29696) 
Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>
 2024-07-04 17:17:47 +10:00
PJBot
acf186490c Automatic changelog update 2024-07-04 07:12:08 +00:00
metalgearsloth
2988ac3839 Make vox roundstart (#29704) 
* Make vox roundstart

I believe all the issues are fixed.

* Click detection bandaid
 2024-07-04 17:11:01 +10:00
PJBot
97d39e0c28 Automatic changelog update 2024-07-04 02:30:32 +00:00
Nemanja
3e3e050aaf Make all nukies humans (#29693) 2024-07-04 12:29:26 +10:00
Errant
223ade9b3f Starting gear for vox crewmembers (#29685) 
* tank harness

* weh

* Suit Storage Whitelist

* Revert "Suit Storage Whitelist"

This reverts commit b1f503573c2936642a2d7627c4852153ec71ce79.

* suit storage filter

* vox spawn gear

* weh
 2024-07-04 12:01:03 +10:00
PJBot
0d80021433 Automatic changelog update 2024-07-04 01:52:52 +00:00
Plykiya
62fcb6bd96 Makes portable flashers destructable (#29564) 
Makes portable flashers destructible

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-04 11:51:46 +10:00
PJBot
406cf7adcd Automatic changelog update 2024-07-04 01:30:13 +00:00
Plykiya
48ae8ce0a8 Fixes objects changing physics behavior after being pulled (#29694) 
* Fixes pull rotation logic

* cleaner condition

* even less code

* I CHANGED MY MIND

* first one

* second one

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-04 11:29:07 +10:00
PJBot
143151f284 Automatic changelog update 2024-07-04 01:26:31 +00:00
Rinary
9120f5fada Dynamic Radial Menus (#29678) 
* fix

* Clean Some Code

* Some Commentaries

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

* Update Content.Client/UserInterface/Controls/RadialContainer.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-04 11:25:25 +10:00
Nemanja
e612ccda92 add apc power draw to stat value command (#29701) 
add apc stat value
 2024-07-04 11:13:49 +10:00
Interrobang01
5198c87597 improved wrench description (#29700) 
Lefty latchy, righty removey
 2024-07-03 20:43:42 -04:00
PJBot
5c1aa578ef Automatic changelog update 2024-07-03 17:00:36 +00:00
ArkiveDev
54c659f4aa Allow construction of rotated railings (#29687) 
* Remove southRotation from railing structures

* Curly Braces
 2024-07-03 12:59:29 -04:00
Alex Pavlenko
ac87f7a977 feat: allow developers to customize vscode settings, closes #29285 (#29294) 2024-07-03 11:37:40 -04:00
PJBot
833320a34a Automatic changelog update 2024-07-03 15:15:47 +00:00
Ed
a981f99b06 New anomaly behaviour: Invisibility (#29120) 
* invisible anomaly

* good luck
 2024-07-03 11:14:39 -04:00
Ed
7477b7c869 Cloud shadows (#298) 
* not worked

* fix

* Update CP14CloudShadowsComponent.cs

* more params in component
 2024-07-03 17:33:38 +03:00
metalgearsloth
a2f99cc69e VGRoid support (#27659) 
* Dungeon spawn support for grid spawns

* Recursive dungeons working

* Mask approach working

* zack

* More work

* Fix recursive dungeons

* Heap of work

* weh

* the cud

* rar

* Job

* weh

* weh

* weh

* Master merges

* orch

* weh

* vgroid most of the work

* Tweaks

* Tweaks

* weh

* do do do do do do

* Basic layout

* Ore spawning working

* Big breaking changes

* Mob gen working

* weh

* Finalising

* emo

* More finalising

* reverty

* Reduce distance
 2024-07-03 22:23:11 +10:00
Token
d54d27cda4 stuttering on bloodloss and electricity damage (#294) 2024-07-03 14:17:34 +03:00
Ed
e9aab2b722 World borders (#296) 
* world edge mechanic

* visual fog
 2024-07-03 14:06:32 +03:00