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

2225 Commits

Author SHA1 Message Date
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
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
Nemanja
e612ccda92 add apc power draw to stat value command (#29701) 
add apc stat value
 2024-07-04 11:13:49 +10:00
Ed
a981f99b06 New anomaly behaviour: Invisibility (#29120) 
* invisible anomaly

* good luck
 2024-07-03 11:14:39 -04:00
Ed
e9aab2b722 World borders (#296) 
* world edge mechanic

* visual fog
 2024-07-03 14:06:32 +03:00
Leon Friedrich
1faa1b5df6 Allow zoom command to modify an eye's PVS range (#29245) 
Allow zoom command to modify an eye's PVS range

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-03 16:44:55 +10:00
Ed
074ec3e17d Goblin species (#295) 
* Create CP14HandDisplacementMapComponent.cs

* idk if it works, we need goblin first

* some clean up

* add goblin species sprites

* basic goblic species prototype

* hairs, ears

* typo

* hand displacement maps

* shoes displacement

* shirt displacement

* head displacement. Add support different size maps

* +dummy

* eyes displacement

* pants displacement

* gloves displacements

* cloak and mask displacement (final)

* belt displacement!

* add nose customization

* +2 ears customization
 2024-07-03 01:09:57 +03:00
Nemanja
162913ccd0 Selectable Bar Signs (#29068) 
* make bar sign selectable

* ajcm strongest soldier

* AJCM comes down hard for round 2

* good shit

* ok ballin

* bless'ed be the webedit
 2024-07-01 02:20:57 +10: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
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
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
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
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
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
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
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
Chief-Engineer
c81ba6e4a9 Alert shared connections (#29405) 
* add admin alert for active shared connections

* update wizden config

* review
 2024-06-26 15:43:43 +02:00
Tayrtahn
1a67ab8c95 Forcemap can be cleared with empty string again (#29472) 2024-06-26 16:41:31 +10:00
Tayrtahn
8aea47a7ee Fix forcemap not bypassing requirements (#29426) 
* Fix forcemap not bypassing requirements

* Add integration test for forcemap
 2024-06-24 18:29:44 -04:00
metalgearsloth
0546c9bf64 Revert "Weapon Reflection Movement Mechanic (#27219)" (#29326) 
* Revert "Weapon Reflection Movement Mechanic (#27219)"

This reverts commit b90373356e.

# Conflicts:
#	Content.Shared/Alert/AlertType.cs
#	Content.Shared/Weapons/Reflect/ReflectSystem.cs

* Add myself to codeowners

* Add myself to codeowners

* Also the alerts
 2024-06-22 22:16:08 -04:00
K-Dynamic
2a6fc45ab5 Thief toolbox minor rebalance & description clean-up (#27771) 
* thief clean-up

* anatomy set description change

* description changes
 2024-06-23 01:44:18 +10:00
deltanedas
475c2a0b42 add access reader log wire (#29094) 
* add LoggingDisabled to AccessReader

* add LogWireAction

* -m give everything besides high-security door a log wire

* make LogAccess public and support string arg

* add log when pulsing

* m

* l

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-23 01:12:58 +10:00
MetalSage
061c1f520c Admin UI localization (#29340) 
admin ui localization

Co-authored-by: MetalSage <metalsage.official@gmail.com>
 2024-06-22 23:05:33 +10:00
Pieter-Jan Briers
07fe1a6b5a Rewrite the options menu (#28389) 
* Basic attempt at rewriting how the options menu works, move accessibility settings into their own tab.

* Audio tab uses the new options system.

* Rewrite Misc tab

* Clean up heading styling

* Rewrite options tab and other minor cleanup all over the place.

* Documentation comments and minor cleanup.

---------

Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-06-22 14:11:14 +10: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
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
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
slarticodefast
d62dddcfcb fix initial infected icons and add a briefing to the character menu (#29259) 2024-06-21 15:42:17 +10: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
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
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
Mr. 27
8c9fcd4ca7 Fix ERT becoming sleeper agents and add sleeper agent preferences (#27817) 
* b

* Update antags.ftl

* m

* ok

* Update events.yml

* antag

* a

* Create InitialInfectedExemptComponent.cs

* Delete InitialInfectedExemptComponent.cs

* yes

* Delete InitialInfectedExemptComponent.cs

* Create AntagImmuneComponent.cs
 2024-06-20 21:12:58 +10:00
lzk
2b885272c8 Musician's skirt (#29203) 
* Sprites&Meta

* Changing prototypes

* Adding to Theater vend

* Sprite_Change

* Sprite_Change

* Prototype_Changes

Is this exactly how it should be?...

* FUCKING FIX

* weh

---------

Co-authored-by: Арт <123451459+JustArt1m@users.noreply.github.com>
 2024-06-19 17:06:03 +03:00
beck-thompson
6c810003db Grammar fix to medibot! (#29197) 
fixed
 2024-06-18 23:42:45 -04:00
beck-thompson
bde0f43171 Add some happier medibot messages! (#29147) 
* Happy!

* opps

* one more
 2024-06-19 12:28:30 +10:00
deltanedas
0910983c4b unhardcode thief MaxSelectedSets (#29175) 
* unhardcode thief MaxSelectedSets

* we do a little copy paste :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
 2024-06-19 10:29:06 +10:00
Ed
02b7fe5933 marking update (#254) 
* new horny horns

* fuck this horns

* horns and hairs

* glasses resprite

* наращивание волос

* больше наращивания

* Update braid.png
 2024-06-17 22:11:22 +03:00
Tayrtahn
e5a85e2a13 Make wearing an Ushanka also apply accent to your name (#29111) 2024-06-17 14:03:55 -04:00
Ed
4ecdb6f296 Update lube.ftl 2024-06-17 16:32:55 +03:00
Ed
917f2de69e Update glue.ftl 2024-06-17 16:16:09 +03:00
Ed
ac3a7a5c1b Update cluwne.ftl 2024-06-17 15:06:46 +03:00
Ed
f1c4e9e382 Update transformable-container-component.ftl 2024-06-17 14:48:40 +03:00
Ed
04d29b6268 Merge remote-tracking branch 'upstream/master' into ed-17-06-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/oasis.yml
 2024-06-17 14:20:38 +03:00
Ubaser
5038012b67 Add new lizard horns, Demonic (#29022) 
add
 2024-06-17 13:53:47 +03:00
deltanedas
c332677971 remove robotics console emag checking, make it a bit fairer (#27876) 2024-06-16 23:30:10 -04:00
Tayrtahn
89a9f07c3a Add a system for modifying entity names without causing conflicts (#27863) 2024-06-16 15:38:53 -04:00
Ed
e4678dc66e Nails, Hammer tool and construction recipe update (#249) 
* foundation resprite

* stone material, stack

* nails!

* mini hammer resprite

* hammer tool

* wall building update

* table crafting update

* bonfire craft update

* add wooden wall craft

* chest craft update

* Update attributions.yml

* Update tables.yml

* Update simple.yml
 2024-06-16 18:31:47 +03:00