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

26182 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ed
1dbe308527 Entity ru localization sync (#285) 
* first use

* LOCALIZAAATION

* and again

* Update fire.yml

* Update entities.ftl

* Update main.py

* Update main.py

* delete wrong locales

* battle staff locale

* Update main.py

* more remove

* Update wielded-inhand-right.png
 2024-06-28 12:25:20 +03:00
Ed
54ecb1b23e added battle staff (#286) 2024-06-27 23:29:27 +03:00
Jaraten
dcfd3f6aa5 New tiles (#274) 
* New tiles

* fix yaml & resprite

* migration fix

* ftl fix

* fix typo

* fix typo +1

* fix C# typo

---------

Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:16:05 +03:00
comasqw
b592842a66 fix localization helper & protos descriptions in ftl (#282) 
* fix localization helper & protos descriptions in ftl

* Update main.py

* Update objects.ftl

* добавил ярлык напрямую к файлу локализации

* megasuperduperpuperTWEAK

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update yml_parser.py

* Update main.py

* tweak

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Ed <edwardxperia2000@gmail.com>
 2024-06-27 22:07:25 +03:00
Ed
4d5fa91a39 Update hcut.swsl (#284) 2024-06-27 14:35:06 +03:00
Ed
798539899d experimental cliffs (#283) 2024-06-27 14:04:57 +03:00
comasqw
fa86f705aa Localization Helper (#275) 
* Localization Helper

* Update main.py

* Update main.py

* adding comments to code and translating exceptions into English

* cringe fix

* Update yml_parser.py

* tweak

* Update main.py
 2024-06-25 18:02:02 +03:00
Imperator Shlepa
e12f499594 Craft for stone walls. (#280) 
* 123123

* Update Resources/Prototypes/_CP14/Recipes/Construction/walls.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-25 12:07:01 +03:00
Deserty0
eb8acd223a Size fix (#276) 
* Update eyes.yml

* уэээ
 2024-06-24 18:20:06 +03:00
Ed
34ae041f99 new lobby art (#267) 
* add lobby art

* Update typicalAlchemistDay.webp
 2024-06-22 19:27:57 +03:00
Jaraten
294f81bd0f resprite stone&red_brick-walls (#265) 2024-06-22 00:17:10 +03:00
Nim
3492a7892a Mannequin (#253) 
* mannequin

* fix

* fix2

* Update mannequin.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
 2024-06-21 23:17:49 +03:00
Ed
d973969a02 Merge pull request #263 from crystallpunk-14/ed-21-06-2024-upstream-sync 
upstream sync
 2024-06-21 18:47:38 +03:00
Ed
e440434938 Update arenas.yml 2024-06-21 18:37:24 +03:00
Ed
3a910a7f7f Merge remote-tracking branch 'upstream/master' into ed-21-06-2024-upstream-sync 
# Conflicts:
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/train.yml
 2024-06-21 18:30:31 +03:00
Ed
e2f97ece50 Wallmount update (#262) 
* add wallmount systems

* add construction condition
 2024-06-21 18:27:18 +03:00
Pieter-Jan Briers
f041f58a6d Add time index to connection log (#29281) 
* Add time index to connection log

Queries go nyoom.

* Don't let me code shit at 5 AM
 2024-06-21 15:29:10 +02:00
PJBot
730a4d289d Automatic changelog update 2024-06-21 12:07:14 +00:00
nikthechampiongr
76a65c8e43 Implement BlacklistedRange exempt flag (#29258) 
* Implement a new kind of ip range ban that only applies to new players

* Put determining whether a player record exists to its own function

* Make BlacklistedRange bans get bypassed by any ban exemption

* Stop trying to get another DbGuard while already having one

This does break with convention on the functions in that area but
considering the use of this function it's probably fine?
I could alternatively just move the place it's called from.

Also I was suppossed to wait for tests to finish locally just to be
sure, but nah. I am pushing this now
 2024-06-21 14:06:07 +02:00
PJBot
6b13f5f0cb Automatic changelog update 2024-06-21 10:51:58 +00:00
Leon Friedrich
70a40b62cb Fix some buckle interactions (#29293) 2024-06-21 03:50:52 -07:00
PJBot
38439996e9 Automatic changelog update 2024-06-21 09:43:00 +00:00
TsjipTsjip
949a837720 Ghostrole rule updates (#29249) 
* First batch of ghostrole rule updates

* Second pass

* Re-word free agent

* Apply review comments

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

* You heard it here first folks

God rules are weird to write.

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

* Honkbot -> Free Agent

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

* Mimebot -> Free Agent

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

* Jonkbot -> Free Agent

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

* Softer blue

---------

Co-authored-by: Chief-Engineer <119664036+Chief-Engineer@users.noreply.github.com>
 2024-06-21 04:41:54 -05:00
Alex Pavlenko
711acedfe5 feat: update cyborg parts naming for them to be ordered consistently,… (#29272) 
feat: update cyborg parts naming for them to be ordered consistently, closes #29270
 2024-06-21 09:43:15 +03:00
PJBot
7ef1002101 Automatic changelog update 2024-06-21 05:43:23 +00:00
slarticodefast
d62dddcfcb fix initial infected icons and add a briefing to the character menu (#29259) 2024-06-21 15:42:17 +10:00
Tayrtahn
880fef507d Replace BlockSolutionAccessComponent with an attempt event (#26988) 
* BlockSolutionAccessComponent now only blocks one specified solution.

* Significant overhaul
Separated spilling when worn functionality into its own component/system.
Removed BlockSolutionAccessComponent.
Added an event for solution access.
 2024-06-21 13:04:02 +10:00
PJBot
f94d663452 Automatic changelog update 2024-06-21 03:03:30 +00:00
MilenVolf
9cd2705d6b Make stasis bed power toggleable (#29268) 
Stasis bed is now power toggleable
 2024-06-21 13:02:23 +10:00
Tayrtahn
afc800274c Fix null exceptions in SurveillanceCameraMonitorSystem (#29275) 
* Add IsNullOrEmpty checks before indexing KnownSubnets

* actor
 2024-06-21 10:17:16 +10:00
Tayrtahn
0b3459268a Add logging to SharedStorageSystem prototype indexing failure (#29273) 2024-06-21 10:16:43 +10:00
Tayrtahn
831d962e5a Make Loadout MinLimit not count failed attempts (#29264) 
Loadout MinLimit doesn't count failed attempts
 2024-06-21 10:15:37 +10:00
deltanedas
a3ffe22e66 return empty string for invalid identity (#29274) 
Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-20 18:25:35 -04:00
Pieter-Jan Briers
c33644532d Rate limit ahelps (#29219) 
* Make chat rate limits a general-purpose system.

Intending to use this with ahelps next.

* Rate limt ahelps

Fixes #28762

* Review comments
 2024-06-21 00:13:02 +02:00
Ed
03adbaf851 Tiles update + iron bards (#260) 
* wooden tiles update

* add iron bars

* dirt tile update

* fix foundation tile
 2024-06-21 00:18:47 +03:00
Ed
ec3efce19c Ed 20 06 2024 grass update (#259) 
* grass update

* +2 grass tile

* Update biomes_template_grasslands.yml

* Update biomes_template_grasslands.yml
 2024-06-20 18:18:29 +03:00
Ghagliiarghii
b90c6acacd golden plunger (#29043) 
* golden plunger

* Add wood material (the handle is still wood)

* 52 hours

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-06-21 00:24:36 +10:00
PJBot
0a3b221766 Automatic changelog update 2024-06-20 14:20:29 +00:00
MilenVolf
50146d4b98 Fix prying speed & log (#29210) 
* cleanup prototypes with `PryingComponent` & fix jaws of life prying speed

* Minor cleanup for tools and prying systems

Remove some obsolete methods.

* Fix doafter continues when not held & log

* Modifiy delays for floor prying

* Fix test fail
 2024-06-21 00:19:22 +10:00
PJBot
c91789a78d Automatic changelog update 2024-06-20 14:06:47 +00:00
Pieter-Jan Briers
cf374ac905 You can now pry multiple tiles at once (#29231) 
* You can now pry multiple tiles at once

* More advanced do after duplicate checking.

Instead of just saying "lol tile prying can raise duplicates", we now have a system so tile prying can properly distinguish events on 2 different tiles. This is achieved with a virtual function on DoAfterEvent.
 2024-06-21 00:05:40 +10:00
Errant
d15eafe133 Survival Box Loadouts, Nitrogen Emergency tanks (#29131) 
* Nitrogen survival boxes

* Zero-setup workaround

* clown box

* cleanup and universal tanks

* cleanup

* more cleanup

* hide loadoutgroups

* remaining survival boxes

* space ninja

* Revert "space ninja"

This reverts commit a650f417f83f5861e0001b25418e4a361927c6c6.

* weh

* weh

* undo appearance change of syndicate survival boxes

* indentation fix and missing label
 2024-06-21 00:05:01 +10:00
PJBot
7994175aba Automatic changelog update 2024-06-20 12:35:52 +00:00
Redfire1331
68c414e8ed made cup ramen eatable with anything with the fork component (#27826) 
* made cup ramen eatable with anything with the fork component

* removed extra png

* made cupramen fillable with water, and made hot ramen dry ramen.

---------

Co-authored-by: redfire1331 <Redfire1331@users.noreply.github.com>
 2024-06-20 22:34:46 +10:00
PJBot
514e7600c6 Automatic changelog update 2024-06-20 12:23:10 +00:00
Boaz1111
a74ca54cf8 moves explosive tech to T1 (#29227) 
moves explo tech to T1
 2024-06-20 22:22:04 +10:00
PJBot
0ac1b31e36 Automatic changelog update 2024-06-20 11:59:57 +00:00
lzk
4fe5235e37 Buff cube boxes (#29251) 2024-06-20 14:58:51 +03:00
PJBot
9fbcec1c74 Automatic changelog update 2024-06-20 11:17:18 +00:00
neutrino
9bf4a28f4d fixed Syndicate smokes pack being half-filled (#28371) 2024-06-20 21:16:06 +10:00