juni/crystall-punk-14
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,294 Commits 57 Branches 0 Tags
7cdfaa09d5f690f1e56d00a831becf27c485457f
Commit Graph

17294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nemanja
7cdfaa09d5 Procgen asteroids for salvage magnet (#17547) 
* Procgen asteroids for salvage magnet

* big roids, remove min offset radius

* i fuck with configs a bit more

* some shit i guess

* actually this makes more sense
 2023-06-25 12:50:41 -05:00
metalgearsloth
c82d1b437e Fix some MapPainter warnings (#17639) 2023-06-26 01:56:20 +10:00
PJBot
09d327cc99 Automatic changelog update 2023-06-25 11:45:42 -04:00
Nemanja
5c60a27c7c Make item size scale with stack size (#17623) 
* Make stack count affect item size

* and the test, too

* readd this check

* vwoom

* huh

* if you ever read this commit message ping me on discord in #contributors

* changerinos
 2023-06-25 10:44:37 -05:00
metalgearsloth
0d086df2e5 Update submodule to 131.1.0 (#17633) 2023-06-25 22:03:01 +10:00
Leon Friedrich
a276b49376 Fix replay eye rotation bug (#17625) 2023-06-25 17:05:40 +10:00
Moony
7af0ae540d Update Engine (#17622) 
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
 2023-06-24 19:03:33 -05:00
Pieter-Jan Briers
bbd8ce8885 Replays: final boss (#17621) 
* Replays: final boss

* Undo formatting change in EntryPoint
 2023-06-24 18:56:33 -05:00
PJBot
204f6ca5c2 Automatic changelog update 2023-06-24 16:08:28 -04:00
Myakot
20b55d7af8 gbookcommits (#17611) 2023-06-24 14:07:25 -06:00
PJBot
826a015aa5 Automatic changelog update 2023-06-24 16:06:06 -04:00
deltanedas
809255ffb1 give regular crowbar same damage as emergency (#17284) 
* swap emergency and regular crowbar damage

* a

* same damage

* remove dupe

* egg

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-24 14:05:02 -06:00
PJBot
ee98de4927 Automatic changelog update 2023-06-24 16:02:07 -04:00
Alekshhh
c9f6f630ec drugs (#17588) 2023-06-24 14:01:03 -06:00
PJBot
9fc8d9f41e Automatic changelog update 2023-06-24 15:59:00 -04:00
Scribbles0
25bd1eba19 cargo bounty computer (#17596) 2023-06-24 13:58:51 -06:00
Scribbles0
a88c16f3e9 bounty computer + minor deletions/fixes (#17597) 2023-06-24 13:58:39 -06:00
deltanedas
eec74aa54b saltern 4.13 (#17606) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2023-06-24 13:58:25 -06:00
Sailor
8ce0370544 Commit trolling (#17607) 2023-06-24 13:57:56 -06:00
PJBot
f108763c57 Automatic changelog update 2023-06-24 15:57:46 -04:00
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617) 
* he's got a gun

* gung

* oops
 2023-06-24 13:56:42 -06:00
OctoRocket
4c15474619 [Sprite] Fix an error in the flannel sprite. (#17618) 2023-06-24 13:56:31 -06:00
PJBot
aea3bf9372 Automatic changelog update 2023-06-24 14:10:28 -04:00
0x6273
fcb6516cee Hotplate overhaul (#17586) 
* Hotplate overhaul

- Beakers are now placed on top of the hotplate instead of itemslot.
- Hotplate LED now only lights up if it's heating something.
- More comments/xmldoc.
- Some other minor tweaks.

* Actually remove the beaker slot
 2023-06-24 14:09:24 -04:00
PJBot
084cb7b750 Automatic changelog update 2023-06-24 08:12:51 -04:00
LankLTE
de07c2b599 Adds Health Analyzer to Chem PDA (#17603) 2023-06-24 22:11:47 +10:00
Leon Friedrich
ecae0230f6 Remove TickerLobbyReadyEvent (#17522) 2023-06-24 22:11:08 +10:00
Nemanja
694ba695b0 fix galaxythistle bounty locale (#17594) 2023-06-24 22:08:47 +10:00
HighTechPuddle
4ae80fb276 Issue#15607-Audio/Ambience (#17327) 2023-06-24 22:06:33 +10:00
PJBot
2b7a30403d Automatic changelog update 2023-06-24 08:04:12 -04:00
Nim
46e96239d3 Seeds of fly agarics Amanita EMAG (#17598) 2023-06-24 22:03:08 +10:00
Pieter-Jan Briers
f5bd24f990 Clean up PDA event subscriptions. (#17434) 
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2023-06-24 22:02:59 +10:00
PJBot
4d493ba674 Automatic changelog update 2023-06-24 08:01:47 -04:00
Pieter-Jan Briers
3e03418238 Allow changing alert level delay. (#17435) 2023-06-24 22:01:14 +10:00
Nemanja
489077868c Artifexium (#17604) 2023-06-24 22:00:42 +10:00
lzk
5d126d7774 Remove some dupe prototype components (#17551) 2023-06-24 21:59:20 +10:00
PJBot
64a5f2e536 Automatic changelog update 2023-06-24 01:33:19 -04:00
crazybrain23
032399c599 Change QM's supervisor to Captain (#17605) 
* QM works for Cap

* Cargo department works for QM
 2023-06-24 00:32:15 -05:00
PJBot
c64cce40ac Automatic changelog update 2023-06-24 00:21:30 -04:00
Nemanja
bdbd01fbaf node scanner resprite (#17609) 2023-06-24 14:20:26 +10:00
PJBot
62dc357d1e Automatic changelog update 2023-06-23 13:50:24 -04:00
CrigCrag
9792116c50 janitorial trolley speed buff (#17524) 
* Update janitor.yml

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>

* Update janitor.yml

friction gaming

* tweak cart friction

* Update Resources/Prototypes/Entities/Objects/Specific/Janitorial/janitor.yml

* comment

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2023-06-23 12:49:19 -05:00
Chief-Engineer
4bd6f921c4 add signaler logs (#17556) 2023-06-23 22:26:37 +10:00
PJBot
6d52ca1e16 Automatic changelog update 2023-06-23 08:25:45 -04:00
lzk
5e83956d15 Fix jumpskirt parents (#17552) 2023-06-23 22:24:38 +10:00
FluidRock
17254eca15 Replace flare ammo with incendiary ammo in Zombie bundle (#17558) 2023-06-23 22:24:03 +10:00
lzk
6bfccca81b encryption-key-component.ftl locale update (#17557) 2023-06-23 22:23:47 +10:00
Justin Trotter
ecf92066ab make mining drills weldable and have struct damage (#17576) 2023-06-23 22:23:20 +10:00
Justin Trotter
12a44bf4e0 uranium spears make damage sounds (#17575) 2023-06-23 22:23:08 +10:00
PJBot
7bb0f36bf4 Automatic changelog update 2023-06-23 00:32:58 -04:00