Commit Graph

960 Commits

Author SHA1 Message Date
Nemanja
2a83a9bc17 [Sci] Non-destructive XenoArch Research (#15398)
* Non-destructive XenoArch research

* nerf the price

* Points -> Extract
2023-04-16 23:57:21 -06:00
Morb
2eb2ded7f3 Multiline edit everywhere (#15216) 2023-04-14 12:57:47 -07:00
Nemanja
bc014803d0 [Fix] "Syndicate Rubber Btamp" (#15401) 2023-04-14 13:53:36 -06:00
Slava0135
7886d27dda Add radio jammer (#14369) 2023-04-14 12:50:19 -07:00
deltanedas
ffe946729f refactor toilet (#15406)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-14 01:45:58 -07:00
deltanedas
457af3ee30 pet dehydrated fish to make him nice to you (#14709)
* petting fish to make him nice to you

* fix fishe, refactor a bit

* fishe

* pro

* feedback, for now

* refactor

* pro

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-13 18:17:25 -07:00
ShadowCommander
3b21421ef1 Add EscapeContext keybind (#15301)
* Add EscapeContext

Escape context input closes windows if there are any open. If there are not any windows it opens the game menu.

* Add fluent for Escape Context

* Move EngineContext keybind to content

* Readd WindowCloseAll

* Fix EscapeContext not opening the game menu after using WindowCloseAll

WindowCloseAll does not clear the CloseRecentWindowUIController.recentlyInteractedWindows, which caused HasClosableWindow to return true because the list still had items.

Changed HasClosableWindow to check if windows in the list are still open and clear them if they aren't.

* Clean up EscapeContextUIController
2023-04-13 18:10:44 -07:00
Nemanja
ccf81a6be9 Add autocomplete to setgamepreset command (#15399)
* Add autocomplete to setgamepreset

* better ordering
2023-04-13 18:06:06 -07:00
metalgearsloth
be4e69b0c0 Station maps (#13027) 2023-04-13 16:21:24 +10:00
Artjom
d3936b24fe Fingerprints filter for records station computer (#15017)
* add new labels and buttons for records stantion console

* add fingerprint fields for server

* set buttons and updates for fingerPrints filters

* set fingerprints filters

* final set for finger prints filters

* add new trhaslates for station records computer

* some fix for the PR

* refactor server side station record console system

* add message for filters

* add tranlates

* add new ui with several filters

* updetes prints with server side logic

* resolve conflicts with DNA

* resolve conflicts with DNA

* deleted unused variable and rename some fields

* added description for new state

* added select for filter

* set multiplay filters for the console

* added new translates

* add class filters &  fixed issue with reset line edit

* fix dublicate with set the  selectId for option button

* fixed review notes

* fixed review notes forget changet fix name

* add event TextEntered for better usability

* fixed review notes 3

* fixed formating in xaml

* fixed array with _filterTypes

* fixed ui and made it in minimalistic style

* fixed generalstationRecordFilter class, move method

* delete margin after line edit

* fix placeholder for lineEdit

* fix placeholder for lineEdit, the review note

* Revert "fixed generalstationRecordFilter class, move method"

This reverts commit 1b35c6ac44e7dafe9a1f0560eb177152b822f20b.

* impliment short swith in method IsSkippedRecord

* fixed review notes, remaked method IsSkipped and fix casing

* fixed the review note about check null record name
2023-04-12 07:27:13 -07:00
DrSmugleaf
af49ead70f Add show disconnected button to admin player tab (#15326) 2023-04-12 23:30:03 +10:00
metalgearsloth
3dc0908151 Revert "Show ban and note count in ahelp window" (#15347) 2023-04-12 19:43:33 +10:00
brainfood1183
318cbc4146 Craftable Clown Hardsuit (#15317)
* clownhardsuit

* clothing construction catagory
2023-04-12 02:52:08 -06:00
DrSmugleaf
26cd16eeaa Show ban and note count in ahelp window (#15328) 2023-04-12 10:34:25 +10:00
Puro
682c6e02cc [Job] Brigmedic (#15319)
* [Job] Brigmedic

Everything is included!

* id meta fix

* fix brigmed.yml

* brigmed hardsuit migration
2023-04-11 17:11:01 -06:00
Skye
0df5b6fa27 Rename escape menu title to game menu (#15298) 2023-04-10 23:26:38 -07:00
Skye
405ea8ae49 Rebindable menu + move menu to default F10 (#15287)
* Rebindable menu + move menu to default f11

* Moved to F10

* Specify which menu gets toggled by the EscapeMenu button

---------

Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
2023-04-10 20:40:07 -07:00
deltanedas
27bdc5d4b5 prevent nettles from injecting through hardsuit (#14895)
* prevent nettles from injecting through hardsuit

* pro

* better

* pro

* pro

* noob

* inject popup

* caution

* )

* ;

* 💀

* 💀

* scaf + bomb suit immune to nettle

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-04-10 19:19:43 -07:00
brainfood1183
8e817e2b97 pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
metalgearsloth
317a4013eb Puddles & spreader refactor (#15191) 2023-04-10 15:37:03 +10:00
Nemanja
57f2a768a0 Material Reclaimer (#14969)
* Material Reclaimer

* Fix this test

* autostack output, tweak volume, add upgrade examine

* whitelist AND blacklist support

why not

* trying so hard to get this fucking test to work

* EmoGarbage delves into MaterialArbitrageTest, never to return

* VV and restore cloth to glory

* make the system more robust

* even more stuff has composition; add blacklist for important items

* fix test fails

* convert recycling

* forgor :sadge:

* lol

* simply a modiCUM of doc commentary
2023-04-09 23:38:20 -05:00
lzk228
e76f7d7750 [Cargo] Added MK58 crate (#15204)
* Added crate with MK58 to request console

* fix price

* fix
2023-04-09 16:06:30 -06:00
Skye
af34c497c2 UI: Close window hotkeys (#15227) 2023-04-08 19:19:32 -07:00
Morb
3c06b87572 Use chat emotes for disease (#15134)
* Use chat emote system for disease

* Use chat emotes in prototypes

* Fix sound path

* Fix prototype ids

* Update Content.Server/Disease/DiseaseSystem.cs

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>

---------

Co-authored-by: Flipp Syder <76629141+vulppine@users.noreply.github.com>
2023-04-07 16:17:30 -07:00
Vasilis The Pikachu
1068f83b54 Detective access fluent (#15209) 2023-04-07 14:09:29 -06:00
Kara
e7e9be0073 Reagent interactivity (pt. 1) (#15130)
* Puddle slippy

* spillable melee

* splash spilling!

* splat melee sound

* p
2023-04-06 16:20:48 -05:00
Zoldorf
c851a9af23 Adds uploadfolder command (#15102) 2023-04-05 17:37:05 -06:00
EnDecc
a22a1f5cc4 More Musical Cargo (#15107)
* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Renamed 'Big Band' crate to Variety Instrument collection, narrowed down contents, reduced price. Adjusted contents of Brass crate. Added String, Woodwind, Keyed, Percussion, and Specialty Instrument crates.

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

* Update Resources/Prototypes/Catalog/Cargo/cargo_fun.yml

im sure i'll get used to this
2023-04-04 23:05:24 -06:00
Kara
18df657fb6 Word replacement accent system (#15086) 2023-04-03 19:50:37 -07:00
potato1234_x
a42a2f8021 High-capacity welding fuel tank (#15019)
* high capacity fuel tank

* nerf that explosion holy shit

* e
2023-04-03 00:26:57 -06:00
Pieter-Jan Briers
c8e90e561b Server ban exemption system (#15076) 2023-04-03 10:24:55 +10:00
Slava0135
6412289334 Make energy sword reflect projectiles and hitscan shots (#14029) 2023-04-02 23:48:32 +10:00
metalgearsloth
b6a735774b Add more dungeon layouts (#14924) 2023-03-30 22:54:17 -07:00
faint
8b6996cbae DNA basics (#14724)
* DNA component

* Commit numba 2

* Added DNA into Station Records Computer

* commit numba 3

* commit numba 4

* Vomit also contain DNA component now

* fixed DNA field not clearing after scanning another item

* commit numba 10
Drinking leaves DNA on an object. Breaking glasses, bottles and beakers leave DNA and leave fingerprints/fibers with 40% chance on glass shards. + lotta fixes

* 11

* 12

* 14

* Added DNA guide entry

* FIX
2023-03-30 22:49:25 -06:00
Lei Yunxing
cf61150ebd Adds advanced mop and research (#14917)
* add advanced mop

* make advmop clean faster

* works now

* tweak stats

* tweak speed again

* typo!!!

* copyright change for nerds
2023-03-30 22:21:54 -06:00
DrSmugleaf
ed45440256 Always show ahelp relay message when the relay is enabled (#14931) 2023-03-28 14:27:21 -07:00
Moony
cfeba15e98 Feat 27 03 23 syndie balance (#14913)
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-03-27 20:46:06 -07:00
MisterMecky
a7571ac45b Add cardboard material (#14701)
* add cardboard material

* missing stack visualizers

* add crafting recipes

* cardboard crate

* license thing

* rename various things
2023-03-27 19:04:24 -04:00
Leon Friedrich
4d71b1b81e Revert "Mind ecs" (#14881) 2023-03-27 08:24:00 +11:00
ShadowCommander
bfc4da9377 Mind ecs (#14412) 2023-03-26 14:31:13 -04:00
Alekshhh
0e5dc41fe8 Space Bear Round 3 (#14685) 2023-03-26 13:50:17 -04:00
Nemanja
930d097616 NukeOps start with either station codes or their codes (#14025)
* NukeOps start with all nuke codes

* make it pick a random code

* clarify this
2023-03-26 11:58:57 -05:00
ssdaniel24
e898246af1 Removed duplicated line from chat sanitizer replacements (#14841)
Co-authored-by: ssdaniel24 <ssdaniel24@github.com>
2023-03-25 16:12:02 -07:00
DEATHB4DEFEAT
32cce0d938 uichange Crew Monitor (#14235) 2023-03-25 10:51:28 -04:00
lapatison
ccbf8b5748 Watermelon and grapes (#14587) 2023-03-25 08:15:21 -04:00
dontbetank
5de921b923 Books localization (#14813) 2023-03-24 17:27:30 -04:00
AJCM-git
0377f328e8 Fixes codewords in the roundend summary (#14835) 2023-03-24 15:54:44 -04:00
potato1234_x
51778afe6f TG Vending Machines + Tweaks (#14703)
* d

d

* engivend misalignment

* sustenance vendor

* Revert "sustenance vendor"

This reverts commit 2f4fb47df4529e93b7fc69da1b7a10e8a7c9f2c2.

* shamblers juice

* pwrgame

* most food/drink machines

* robotech deluxe, centdrobe and some restock boxes

* copyright + salv vend

* tweaks

* restock box + more tweaks

* yaml linter fail

* divide vendor contents

* divide contents 2
2023-03-24 02:54:47 -06:00
Leon Friedrich
303506fc38 fix ban command help string (#14820) 2023-03-24 14:49:13 +11:00
metalgearsloth
427e5c95ca Add autocomplete to nukearm (#14819) 2023-03-24 13:50:49 +11:00