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

17306 Commits

Author SHA1 Message Date
Ed
9eb86caa82 CC-BY-SA-3.0 for some assets (#290) 
* Update meta.json

* Update attribution.yml

* Update attribution.yml

* Update attribution.yml

* Update meta.json

* Update attribution.yml

* Update attribution.yml

* Update meta.json

* Update meta.json
 2024-07-01 12:32:59 +03:00
Ed
7e6be7feac fix lava + affectTemp reagent effect 2024-06-30 11:49:51 +03:00
Ed
dbdb81381b Merge remote-tracking branch 'upstream/master' into ed-30-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/box.yml
#	Resources/Prototypes/Maps/meta.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/origin.yml
#	Resources/Prototypes/lobbyscreens.yml
 2024-06-30 11:18:30 +03:00
PJBot
92491c90e0 Automatic changelog update 2024-06-30 04:35:13 +00:00
PJBot
3aa6270de6 Automatic changelog update 2024-06-30 04:29:56 +00:00
PJBot
0974149c82 Automatic changelog update 2024-06-30 03:47:38 +00:00
MureixloI
fef679846c Fix some job's drobes point light (#29590) 
* Fix some job's drobes point light

* Fix some job's drobes point light
 2024-06-30 13:46:31 +10:00
SlamBamActionman
b9fa941ca6 Turn ReagentEffects into generic EntityEffects (#28168) 
* Oh the possibilities

* Merge fixes

* Forgot to remote LavaSystem oops

* Changed EntityEffectArgs to EntityEffectBaseArgs and EntityEffectReagentArgs

* Throw exception for unimplemented effectargs

* Remove Json and overrideable datafields

* Fix test issues

* Actually fix the compiling issue

* Fix comments and remove EntityEffectArgs (no longer used, replaced with EntityEffectBaseArgs)
 2024-06-30 13:43:43 +10:00
github-actions[bot]
af78c75d66 Update Credits (#29594) 
Co-authored-by: PJBot <pieterjan.briers+bot@gmail.com>
 2024-06-29 20:31:18 -04:00
Chief-Engineer
e6e7a29b68 Fix Farm Grass Hopper config for real this time (#29583) 
Update wizardsDenGateway.toml
 2024-06-29 22:18:06 +02:00
PJBot
e8ee3bc1ad Automatic changelog update 2024-06-29 15:24:09 +00:00
Pieter-Jan Briers
2a7bdd9b08 Revert "plutonium core steal objective" (#29578) 
Revert "plutonium core steal objective (#26786)"

This reverts commit f6ce07289a.
 2024-06-30 01:23:03 +10:00
PJBot
325d64b5ed Automatic changelog update 2024-06-29 05:41:03 +00:00
IProduceWidgets
3e7c0a086b Oasis Atmos department rework (#29549) 
* Atmos department rework

* move paperwork back to library

* Would you believe I forgot a valve?

* camer and fore extinguisher wallmounts in new room.
 2024-06-28 23:35:14 -06:00
PJBot
190a051ee9 Automatic changelog update 2024-06-29 05:03:54 +00:00
slarticodefast
cd2968d849 Add sprite for vent under-pressure lock-out (#29527) 2024-06-28 22:02:48 -07:00
PJBot
9ee66892a0 Automatic changelog update 2024-06-29 04:12:38 +00:00
deltanedas
f6ce07289a plutonium core steal objective (#26786) 
* add textures

* add SealingCabinet system

* add StoreUnlocker/ObjectiveUnlock system

* add plutonium core and nuke core container

* make nuke deconstructable

* add steal core objective

* add core extraction toolbox to new category

* typo ops wrench fuel

* use queries and resolve, have it resolve instead of using Comp

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-29 14:11:31 +10:00
PJBot
1c66e1d27d Automatic changelog update 2024-06-29 04:11:07 +00:00
Artjom
881c2323fd Favorites tab for the construction menu (#26347) 
* Added fovarite button

* Some fixes in xaml

* added some events for favorite recipes

* set methods for presenter

* fixes for  presenter

* added translates

* reset seach when you select any category

* added some margins

* some fixes from compared

* fixed PR notes about arrays

* deleted controls & margins

* did simpleer with arrays

* review

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-06-29 14:10:00 +10:00
PJBot
64af03042a Automatic changelog update 2024-06-29 03:35:02 +00:00
PJBot
4cc37a74dc Automatic changelog update 2024-06-29 03:29:53 +00:00
Token
f7e92980ab Mechs now destructable (#29338) 
Add Destructible component to BaseMech
So all mechs are destructable now
 2024-06-29 13:28:46 +10:00
Moomoobeef
cb6aeb4f96 Fixed the pipe in the TEG sprite (#29543) 
fixed sprites
 2024-06-28 22:03:45 -04:00
Brandon Hu
21a93eb6e8 tweak(oasis): Swap floppa and paperwork spawns (#29495) 
tweak(oasis): Swap floppa and paperworkspawns
 2024-06-28 19:24:46 -06:00
PJBot
aa1900d8dd Automatic changelog update 2024-06-28 23:29:33 +00:00
T-Stalker
692a6067e9 Remove rads from bananium (#29545) 
webedit ops
 2024-06-28 19:28:27 -04:00
PJBot
1e027de3e1 Automatic changelog update 2024-06-28 21:22:43 +00:00
Guillaume E
c38859b77a Make miners respect AtmosDeviceUpdateEvent.dt (#29522) 
Miners' prototype have been changed to reflect this (I read
somewhere that we have about 1 atmos tick/0.5s, my tests show more
like 1/0.53 but that looks close enough).

This also means that miner's spawnAmount is now expressed in mol/s.

See: #18781
 2024-06-28 10:49:39 -08:00
Pieter-Jan Briers
6409004244 WATTAGE IS NOT A UNIT OF STORED ENERGY (#29538) 2024-06-28 17:00:45 +02:00
PJBot
315aac9aab Automatic changelog update 2024-06-28 12:34:09 +00:00
slarticodefast
418fc79698 Give passive vents the correct sprite (#29536) 
give passive vents the correct sprite
 2024-06-28 08:33:03 -04:00
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
PJBot
e99e65929e Automatic changelog update 2024-06-28 03:35:30 +00:00
PJBot
1d17e4051f Automatic changelog update 2024-06-28 03:34:04 +00:00
Repo
4a728fa3c6 Fix Admin Object tab sorting and search - Part 2 (#28681) 
* admin Object tab sorting and searchable

* Fix for showing disconnected players on player admin tab

* Fix namespace and search bar location.

* Change linq to loop.

* No more Linq to sort

* Fix item click vv menu

* Added refresh button and refresh on opening tab.

* Clear spaces.

* Move tab magic numbers to enums

* Get rid of old unused xaml

* Fix code style issues and button event type.

* Merge in baby jail

* More style cleanup and move cast around.

* Make the localization a little more easy to read, same loc var names.

* Missed Loc for label

* Fix class field order

* Over zelous delete.

* Small updates.

* Min syntax issues fix
 2024-06-28 13:32:57 +10:00
PJBot
496860e254 Automatic changelog update 2024-06-28 00:24:23 +00:00
JIPDawg
bb50087dd0 Fixed the sound of pulling back a foam crossbow from a flash sound to a bow pull sound. (#29508) 
Fixed foam Crossbow making a flash sound to just a bow pull sound

Co-authored-by: JIP <jipdawg93@gmail.com>
 2024-06-27 20:23:17 -04:00
PJBot
7fa081e884 Automatic changelog update 2024-06-28 00:09:15 +00:00
metalgearsloth
bc1703323e Revert "Make wearing an Ushanka also apply accent to your name" (#29524) 
Revert "Make wearing an Ushanka also apply accent to your name (#29111)"

This reverts commit e5a85e2a13.
 2024-06-28 10:08:09 +10:00
ArkiveDev
d5b5dafb3a Still immovable rods are now actually still (#29518) 
Set the still rod's max velocity to 0 so it gets a 0 mangintude impulse on init
 2024-06-27 18:07:12 -04: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
PJBot
2ed32be514 Automatic changelog update 2024-06-27 15:12:39 +00:00
KonstantinAngelov
64192b3506 CookBook name,id and description changed to not be "meta" (#29467) 
* CookBook name,id and description changed

* Id isues with CookBook fixed

* Maps not added
 2024-06-27 11:11:33 -04:00
PJBot
331c0fe326 Automatic changelog update 2024-06-27 14:59:02 +00: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
PJBot
4ec2966f47 Automatic changelog update 2024-06-27 02:10:04 +00:00