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

2273 Commits

Author SHA1 Message Date
Ed
2367085160 Merge remote-tracking branch 'upstream/master' into ed-23-07-2024-upstream 
# Conflicts:
#	.github/PULL_REQUEST_TEMPLATE.md
#	Content.Client/Clothing/ClientClothingSystem.cs
#	Content.Client/Hands/Systems/HandsSystem.cs
#	Content.IntegrationTests/Tests/PostMapInitTest.cs
#	Content.Shared/Hands/Components/HandsComponent.cs
#	Content.Shared/Inventory/InventoryComponent.cs
#	Content.Shared/Storage/StorageComponent.cs
#	Resources/Prototypes/Accents/word_replacements.yml
#	Resources/Prototypes/Entities/Mobs/Player/human.yml
#	Resources/Prototypes/Maps/Pools/default.yml
#	Resources/Prototypes/Maps/fland.yml
#	Resources/Prototypes/Maps/oasis.yml
#	Resources/Prototypes/Maps/packed.yml
#	Resources/Prototypes/Maps/saltern.yml
 2024-07-23 12:24:42 +03:00
Errant
eb861d173f Wrong magazine popup (#29046) 
* wrong magazine

* a single typo

* removed GunSystem solution

* magazine misfit warnings
 2024-07-22 23:36:05 -07:00
MerrytheManokit
61fd8167e0 Istg, rq, and dw (#30216) 
* Update word_replacements.yml

* Update speech-chatsan.ftl
 2024-07-22 19:53:34 +01:00
Ed
a81465f0d9 Rock and stone mini update (#344) 
* ore resprite

* tools restruct, ore repath, add pickaxr

* fixes

* localizattion sync

* fixes

* Update migration.yml
 2024-07-22 18:46:26 +03:00
Ed
f91a642428 Workbench (#341) 
* craft prototype

* comp + empty system

* simple crafting

* 2 crafts!

* craft dound + delay

* ingredient waste

* verb message

* stack support

* sprite + collision + real crafts

* workbench craft

* fuck

* Update CP14WorkbenchSystem.cs

* fuck ItemPlacer, _lookup lets go
 2024-07-22 12:16:32 +03:00
Plykiya
aded74a88a Syndicate Reinforcement Specializations: Medic, Spy, Thief (#29853) 
* Syndicate thief, spy, medic

* Fixes description for nukies

* update description for uplink

* Implement the radial menu

* forgot these were necessary to push lol

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-21 20:32:25 +10:00
IProduceWidgets
ac53e1d0a0 add an arabian lamp. (#27270) 
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.
 2024-07-21 01:24:28 -06:00
Nemanja
0b5fe2a9ac PA ui cleanup + bugfixes (#28750) 
* ui and visual aspect + radio

* finish jank ui shit and finish radio

* remove radio

* send it

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
 2024-07-21 15:27:18 +10:00
Alzore
93dc22b67d Add the Syndicate Raid Suit (#29845) 
* Syndicate Raid Suit

* Raid suit speed and whitelist

* Fix copyright for the syndicate raid helmet
 2024-07-19 12:38:26 +03:00
Ed
ca843bd84a Merge remote-tracking branch 'upstream/master' into ed-19-07-2024-upstream-walls 
# Conflicts:
#	Content.Server/Damage/Systems/DamageOtherOnHitSystem.cs
 2024-07-19 11:23:38 +03:00
Ed
2bf17fdc35 Content pack (#337) 
* added rope

* black shirt replace

* Update migration.yml

* more berets

* loadout update

* captain role and jacket

* bruhh captain cap

* add one-handed sword

* shield!

* Update entities.ftl
 2024-07-19 00:03:08 +03:00
Ed
dec6a1c2ca Ru localization update (#335) 
* Update entities.ftl

* Update ContentLocalizationManager.cs

* Update ContentLocalizationManager.cs

* Update entities.ftl
 2024-07-18 23:40:06 +03:00
Cojoke
95b56ad4ce Prevent Quantum Spin Inverter from Teleporting Things into Microwaves (#29200) 
* Prevent Quantum Spin Inverter from Teleporting Things into Microwaves

* Simplifies code, GetTeleportingEntity instead of TryGet, adds failed teleport message

* remove using Linguini.Syntax.Ast;

* capital...

* re-add CanInsert and Fixes microwave issue

* beb

* beeb
 2024-07-18 10:40:54 +10:00
Ed
fb7ca28b9a update locales 2024-07-17 23:35:22 +03:00
Ed
02275a0237 Merge remote-tracking branch 'upstream/master' into ed-17-07-2024-upstream 2024-07-17 23:25:31 +03:00
lzk
1fd8369a9c Add examine for caustic and cold damage (#29989) 
* Examinable cold damage

* lightblue

* update grammar

* caustic
 2024-07-17 09:19:13 +03:00
Simon
911a94dba9 Add missing command description to replay_toggleui (#30071) 2024-07-16 11:04:31 +10:00
Ed
8cbd26ae2f Farming WIP (#269) 
* setup planting doafter

* spawn plants after use seed

* some work

* move comps to separate folder

* public check daylight

* daylight plant energy regeneration

* some fixes

* bruh, im thinking

* added ingame soil

* added hoe

* attaching plants

* hoe system

* block plant dublicating

* some planting refactor

* shovel as pant + soil remover

* plant growing visualizer

* soil resprite

* split farming system to second partial class

* update throught event refactor

* tring sync update plant with update visuals

* finish visual sync

* plants growing

* more partial splitting, naming work, clean up

* Update FARMINGTEST.yml

* Update FARMINGTEST.yml

* fix typo

* prototype value validating

* Оно бухает воду!

* solution visualizer in soil

* forgot some fix

* part of Tornado review fix

* destroy RemovePlantComponent

* more fixes

* simple harvesting

* refactor plant component values changing

* harvest redo

* gather on destroyByTool

* sickle resprite

* plant fading

* fading per minute!

* wheat sprites

* YML restruct

* fixes

* auto root plants

* add comments

* move sprites

* split structures from object textures

* wheat farming!

* Update CP14FarmingSystem.Interactions.cs

* seedbed (#297)

seedbed :^)

* a

* Update soil.yml

---------

Co-authored-by: Jaraten <116667537+Jaraten@users.noreply.github.com>
 2024-07-15 23:58:03 +03:00
Ed
028c1ee478 Merge remote-tracking branch 'upstream/master' into ed-15-07-2024-upstream 2024-07-15 12:58:23 +03:00
CookieMasterT
b6115b672a Add petting cyborgs (#30037) 
added petting borgs, adjusted interactions
 2024-07-15 00:09:41 +10:00
lzk
011250f35e Fix AGhostCommand naming (#29945) 2024-07-14 20:25:18 +10:00
Ed
1b0c434a9f Shiny Diamonds (#25750) 
* shiny

* add

* reresprite

* rereresprite

* Add files via upload

* Update ore.yml
 2024-07-13 15:15:57 +03:00
Nemanja
49096cf14f Watches (#29550) 
* watches

* rename

* add it into loot pools
 2024-07-13 16:09:19 +10:00
Ed
0931c9e7d1 Merge remote-tracking branch 'upstream/master' into ed-12-07-2024-upstream 
# Conflicts:
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
 2024-07-12 12:53:42 +03:00
Ed
e87994ae40 Localization clean up + temp eng switch (#325) 
* Update ContentLocalizationManager.cs

* Update battle_royale_temp.yml

* Update basic-effect-reagent.ftl
 2024-07-12 08:34:08 +03:00
chavonadelal
9a17154d83 Аnnouncement sender localization (#29907) 2024-07-12 00:02:53 +10:00
Chief-Engineer
6371a04621 Fix baby jail (#29896) 
* Revert "Revert Baby Jail (#29891)"

This reverts commit 24a2866747.

* the fix
 2024-07-11 15:14:01 +10:00
Vasilis
24a2866747 Revert Baby Jail (#29891) 
* Revert "SS14-28662 Add Baby Jail: a Jail for Babies (inverse panic bunker) (#28763)"

This reverts commit 3ceb92a0c4.

* Revert configs

* Oops
 2024-07-11 10:33:47 +10:00
Winkarst-cpu
adcbe8d0be Character menu asks if you want to save your character on exit (#29875) 
* Character menu asks if you want to save your character on exit

* Fix

* Another fix, little mistake by me

* Update Content.Client/Lobby/UI/CharacterSetupGuiSavePanel.xaml.cs

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
 2024-07-11 10:24:37 +10:00
Tunguso4ka
939f0f4b27 Fixed jobwhitelist locale (#29878) 
Fixed whitelist locale
 2024-07-10 15:27:44 +02:00
dffdff2423
e8b3042a38 Add an option to the admin fax menu to lock papers such that they can't be edited by cybersun pens (#28972) 
* Add option to adminfax for locking papers.

* Replace dummy control with margin
 2024-07-10 15:28:36 +10:00
lzk
93197b6cce Fix colornetwork desc and help (#29856) 
* Fix colornetwork description

* suggested changes

* forgor

* done

* ok now it IS done
 2024-07-10 09:24:38 +10:00
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
lzk
245c99cc78 Fix lobby time typo (#29841) 2024-07-09 23:51:03 +10:00
chavonadelal
04cb2657bf Action menu localization (#29839) 2024-07-09 23:37:00 +10:00
chavonadelal
f3342c5155 localization and change of appearance of the phrase about the remaining time (#29844) 2024-07-09 23:36:33 +10:00
lzk
061ec432ff Add popup for health analyzer target (#29803) 
* Add popup for health analyzer target

* addition

* fix showing popup to all
 2024-07-09 04:42:35 -04:00
lzk
74d9ac7241 Add popup for healing target (#29804) 
* Add popup for healing target

* hop

* huh

* fix one

* fix showing popup to all
 2024-07-09 04:41:47 -04: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
ravage
451d04d759 Add beards (#312) 
* :neckbeard:

borodi

* :neckbeard: v2

a
 2024-07-08 14:21:56 +03:00
Tayrtahn
8c3e72c8c8 Silence ringtones on admin PDAs (#29801) 
* Silence ringtones on invisible PDAs

* Revert "Silence ringtones on invisible PDAs"

This reverts commit afc1041f31eebe82e83630a856a8856b877a9826.

* Literally just this

* Add an admin announcement for news article publishing
 2024-07-08 13:33:17 +10:00
KittenColony
5ae2590667 removed Goblin lastname (#314) 2024-07-07 21:00:02 +03:00
Plykiya
04249e8682 Removes max damage threshold on healing for hyperzine (#29712) 
* Removes max damage threshold for hyperzine

* the description...

---------

Co-authored-by: plykiya <plykiya@protonmail.com>
 2024-07-08 00:28:13 +10:00
Nemanja
21d0f85cc2 metal foam grenades (#29428) 
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push
 2024-07-08 00:26:58 +10:00
Verm
13b84870ec Bartending+: Shaking and Stirring (#29243) 
* Shaking and Stirring

* Remove shake message

* Switch if order a bit

* Add doafter supprot for reactionmixer

* Fix nullability

* Timespan zero

* Forgot to remove loc string

* Reorganize usings

* Remove unneeded usings, fix b52 needing to be shaken
 2024-07-08 00:21:53 +10:00
Nemanja
0e9ed36b85 Intercom buffs and fixes (#29580) 
* Intercom buffs and fixes

* remove unused bui state

* mild sec intercom buff

* reinforce sec intercoms
 2024-07-08 00:19:10 +10:00
Ed
20d6ccffdb Scythe (#311) 
* Scythe

* Update entities.ftl
 2024-07-07 12:55:03 +03:00
Ed
cc9e5f68da Update entities.ftl (#307) 2024-07-05 14:00:56 +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
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