2625 Commits

Author SHA1 Message Date
SlamBamActionman
aabf030515 Changed names of uplink categories and swapped around items (#25079)
* Changed names of uplink categories and swapped around items

* sloth feedback
2024-03-13 20:47:17 +11:00
FungiFellow
471dfed445 Grey Matter Addition and Slime Organ Tweak (#25464)
* Added Grey Matter

* Update diona.yml

* Update human.yml

* Update slime.yml

* Update flavors.yml

* Update biological.yml

* Update physical-desc.ftl

* Update biological.ftl

* Make Slime Brain Grindable

* Slime Organs Grind into Slime

* Update flavor-profiles.ftl

* Added Brain to Blacklist
2024-03-13 20:06:03 +11:00
ThereDrD0
e42a3c40e8 add: add colored armchairs (#190) 2024-03-13 00:53:07 +03:00
UnicornOnLSD
76db710a1c new haircut alternative (brought back old one) (#25935)
added crew cut 2 wew
2024-03-12 14:47:29 -04:00
Alice "Arimah" Heurlin
ffd52b24ff Remove random Cyrillic characters from locale files (#26043) 2024-03-12 16:58:04 +01:00
EnefFlow
f6343d8bdc -add: doxxxom fluff 2024-03-12 13:07:34 +03:00
d6aa8ac5be Merge remote-tracking branch 'upstream/master' into huistream 2024-03-11 11:21:24 +03:00
Cinkafox
95054e072a Fixes (#73)
* - fix: Genitals sprite shit and meow for tajaran

* - add: fart sound if kicked from server

* - tweak: vulpies and tajaran now for donaters!!!

* - fix: Fart on exit

* - add: roleplay think

* - fix: database shit and loc

* - add: ears for slime

* - fix: LOC interaction fix

* - add: height setting

* - fix: height for felinids

* - fix: nigga fix

* - fix: no bitches on captain

* - fix: interaction panel animation shit
2024-03-11 11:13:33 +03:00
LankLTE
88d424e877 Return Detective to Security (#25986)
* Revert "detective patch (#24739)"

This reverts commit 8ef69ff2e1.

* Revert "Detectives gain independency (#23114)"

This reverts commit 807f5facbb.
2024-03-11 14:33:08 +11:00
Arendian
60b9d89e4d Criminal record hud icons (#25192)
* Security hud shows icon based on criminal record status

* Criminal status now linked to name instead of identity

* parole loc

* Test fix

* review changes

* Check station records instead of storing names on criminal record consoles.

* cleanup

* more cleanup

* review changes

* change outdated comments

* rename

* review changes

* remove event subscription

* replaced event with trycomp

* default value
2024-03-11 14:12:52 +11:00
Errant
84a07315dd Species info in Guidebook and at chargen (#25844)
* guidebook pages defined

* species info button in character profile editor

* if current species has no guidebook page then open the parent page

* skrek

* destroying evidence of secret vox plot

* icon size adjustment, no icon if guidebook page for species does not exist

* finished pages

* additional info

* weh
2024-03-10 20:01:32 -07:00
ThereDrD0
3f005b158b Ремув попапа сна (#146)
* remove: remove ZZZ popup

* fix: client popup for target doll
2024-03-11 02:07:37 +03:00
Nemanja
f3f4616c49 Add a toggle for colorblind friendly progress bar colors (#25318)
* Add a toggle for progress bar colors

* yeah this thing

* PJB review

* optimization
2024-03-09 12:43:19 +01:00
MODERN
6e38b992cf CargoConsoleMenu localization (#25931)
- every category of type "cargoProduct" was edited to "cargoproduct-category-name-{categoryName}"
- file "cargoproduct-categories.ftl" was added to english localization to localize categories of cargoProduct
- CargoConsoleMenu.xaml.cs got tweaks which prevent issues with strings comparisons
2024-03-09 17:56:39 +11:00
Remuchi
36c40bafd7 remove: убран акшен Кричать 2024-03-08 23:06:46 +07:00
Remuchi
ae812dde8f add: переводы размеров предметов 2024-03-08 23:01:35 +07:00
Remuchi
dc64a19475 fix: перевод вкуса пива 2024-03-08 22:58:30 +07:00
AlexUm & XGabriel08X
7af183ec72 Barber scissors in uplink and chameleon bundle. (#25920)
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set
2024-03-07 17:55:24 -06:00
Alzore
5f61380209 Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant
2024-03-07 22:37:57 +03:00
beck-thompson
4b359466cc Lawdrobe update (#25299)
* Minor lawdrobe changes

* Updates to advertisements, thank you messages, and emaged / contraband inventory

* Removed the 9th lawdrobe advertisement as it was unused

* Removed soap

---------

Co-authored-by: beck <beck3629@uw.edu>
2024-03-07 22:18:39 +03:00
rhailrake
c08cdeb84d Залью спеллы потестить, мне похуй ПР НОМЕР 156
* refactor CheZaHuetaMagicSystem

* эщкере

* alt-spells system. lmb, rmb, alt-click

* fix

* ChargeSpellsIndicator + Visual(CheZaHueta)

* Custom charge effect for spell

* Custom MaxChargeLevel

* Finally. Alt spells seems to work!! Need to start do spells and gamerule

* fuckkk

* fix crash, actually burn scroll..

* some fixes blyat

* ArcSpell

* очередная CheZaHuetaSystem, ForceSpell

* ONI'SOMA!

* mraow

* prepare this LMAO

* Yebanyy rot etogo kazino blyat! - CardsSpell

* forcewall

* nig

* blink

* Ethereal Jaunt

* игра говно

* Блядина

* ну на еще спеллов

* blyadina

* да иди ты нахуй БЛЯДЬ

* кто прочитал, тот сдохнет. сделай 5 репостов чтобы выжить....

* icons

* та ваще поебать

* одежда
2024-03-07 16:01:54 +00:00
ThereDrD0
ae7665fe9f Фикс the стакан пива (#178)
* fix: fix "the" in russian locale

* missing file
2024-03-07 01:06:28 +07:00
Арт
2ba28cc3d2 New cloth & hair (#25772)
* Clothing sprites & meta

* Changing prototypes & sprites

Rename sprites folder, edit prototypes and meta

* Hair_sprites_&_prototype

Add hair sprites and change prototype

* Update meta.json

* Rename added hair

* Revert "Changing prototypes & sprites"

This reverts commit 801cadbdaa90cfb5e7ae43cd7d017e20b40cdc98.

* Revert "Clothing sprites & meta"

This reverts commit 73442163fd8bc8f49207e616b415dc0f26d6ef32.
2024-03-06 04:42:05 +03:00
Pieter-Jan Briers
d385c1bb23 Paper save button, back to ctrl+enter save. (#25870)
* Revert "Change keybindings for paper (#25853)"

This reverts commit 4b56996fcd.

* Add a save button to the paper editing UI instead.
2024-03-06 12:35:26 +11:00
MACMAN2003
f0e8695a91 Clockwork structures and furniture (#24673)
* sprites

something something strength and certainty of steel (except this is brass)

* test1

* commas it was commas

* commas and brackets

* LET THERE BE BRASS

* brass-glass-etc-windows-thindows-floors-lattice

* ALL THE STRUCTURES!!

"Which structures did you add?"
"all."

* buyable brass

and on the first day the quartermaster said "let there be brass" and all the cargo techs stopped inve$ting in awe

* Update windoor.yml

i forgor 💀

* Update tiles.ftl

* i hate random capital letters

* linter fix 1

whew, thank god for linters

* fix 2

* maybe this

shot in the dark, idk what the hell i'm doing hopefully this fixes it?

* fix attempt 1

weather to true, maybe the thingy got confused?

* remove clockwork lattice

it's fixed the test fail... but at what cost?

* changes 1

* fix clockwork windoor

* FLOORS

HAHAHA LET THERE BE FLOORS

* try linter fix 1

i love linters they find things i'd never catch myself

* tweaks fixes 1

fixes merge conflict and does more stuff part two later because i'm tired

* tweaks fixes 2

i should probably do this stuff during the day when i have more energy but eh

* Update assembly.yml

* Update chairs.yml

* fix door sprites

somehow the deny_unlit was broken for all the clockwork doors

* fix glass.yml
2024-03-06 03:25:59 +03:00
Aviu00
fef46680fb - add: Add advanced implanter. (#171)
* - add: Add advanced implanter.

* - tweak: All implants are single use now.
2024-03-06 01:42:07 +07:00
ThereDrD0
9251e909ab Fix popups (#176)
* fix: fix popups

* fix: fix naming for backstab
2024-03-04 13:56:23 +07:00
Plykiya
4f7ff56e87 Syringe QoL improvements (#25480)
Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-04 01:07:11 -04:00
metalgearsloth
c5486873db Shuttle console + FTL rework (#24430)
* Add shuttle interior drawing back

Just do it per-tile she'll be right, at least it's done with 1 draw call.

* Revamp shuttle console

* Bunch of cleanup work

* Lables sortito

* dok

* Pixel alignment and colours

* Fix a bunch of drawing bugs

* Shuttle map drawing

* Drawing fixes

* Map parallax working finally

* weh

* Commit all my stuff

* mic

* deez

* Update everything

* Xamlify everything

* uh

* Rudimentary blocker range

* My enemies have succeeded

* Bunch of changes to FTL

* Heaps of cleanup

* Fix FTL bugs

* FTL

* weewoo

* FTL fallback

* wew

* weh

* Basic FTL working

* FTL working

* FTL destination fixes

* a

* Exclusion zones

* Fix drawing / FTL

* Beacons working

* Coordinates drawing

* Fix unknown map names

* Dorks beginning

* State + docking cleanup start

* Basic dock drawing

* Bunch of drawing fixes

* Batching / color fixes

* Cleanup and beacons support

* weh

* weh

* Begin pings

* First draft at map objects

* Map fixup

* Faster drawing

* Fix perf + FTL

* Cached drawing

* Fix drawing

* Best I got

* strips

* Back to lists but with caching

* Final optimisation

* Fix dock bounds

* Docking work

* stinker

* kobolds

* Btns

* Docking vis working

* Fix docking pre-vis

* canasses

* Helldivers 2

* a

* Array life

* Fix

* Fix TODOs

* liltenhead feature club

* dorking

* Merge artifacts

* Last-minute touchup
2024-03-03 18:39:19 +11:00
LordCarve
06d755a860 Make ItemSlots more verbose + AME proof of concept (#25779)
* Make itemslots more verbose with AME proof of concept.

* Remove unnecessary [DataField] strings and use null coalescing in whitelist checks.

* Change optional popup fields into LocId.
2024-03-03 16:37:34 +11:00
Tayrtahn
4943151111 Add prediction for puddle and spillable examines (#25794)
Prediction for puddle and spillable examines
2024-03-03 16:36:36 +11:00
lapatison
4f7facbd73 Small news manager localisation (#25718)
* loc

* per review

* Update Content.Client/MassMedia/Ui/ArticleEditorPanel.xaml

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-03-02 21:39:29 +01:00
ffaa0c6815 Merge remote-tracking branch 'upstream/master' into upstream 2024-03-02 18:40:57 +03:00
Remuchi
477dedc014 [Feat] Mindslave - имплант подчинения (#152)
* tweak: стандартизация названий имплантеров

* add: mindslave implant

* add: briefing, uplink listing, overlay icons

* add: new mindslave overlay icons by JustNemo

* remove: ненужный файлик удалён

* fix: фикс доставания импланта подчинения
2024-03-02 21:17:52 +07:00
Remuchi
ad525c86c6 [Fix] Разные фиксы (#161)
* fix: фикс отображений в ахелпе

* fix: нотисы в чат больше не отправляют сообщение в консоль

* fix: исправлена текстура секретной двери

* fix: ошибки перевода при вылизывании ран
2024-03-02 21:16:27 +07:00
614318c0f2 Merge remote-tracking branch 'upstream/master' into upstream
# Conflicts:
#	Content.Client/Humanoid/HumanoidAppearanceSystem.cs
#	Content.Server/Humanoid/Systems/HumanoidAppearanceSystem.cs
#	Content.Shared/Humanoid/HumanoidCharacterAppearance.cs
#	Content.Shared/Humanoid/SharedHumanoidAppearanceSystem.cs
2024-03-02 16:39:39 +03:00
Aviu00
a935aa2242 Shock collar
(cherry picked from commit e34770d7e5399195b8f762e545eddab8a3c2dd4f)
2024-03-02 16:08:39 +03:00
d5b3f707d1 - fix: some message for interactions 2024-03-02 15:55:41 +03:00
Valtos
4c8e398b3d new tts voices (#158) 2024-03-02 05:58:21 +00:00
IlyaElDunaev
81b016433f Detective's rubber stamp (#25676)
Stamp Detective
2024-03-01 17:50:17 -05:00
Remuchi
9430e2d53c Всякое по мелочи (#148)
* fix: у мартышек снова отображается одежда

* fix: с зеркалом снова можно взаимодействовать

* tweak: шлюзы культа теперь работают как двери, а не шлюзы

* remove: убрано отображение текущего патрона у револьверов

* add: новые плитки для мапперов
2024-03-01 15:51:17 +07:00
Aviu00
71ca698a7c Spells stuff (#153)
* -add: Create and remove blood spells using verbs.

* - add: Blood spells now have charges and disappear.

* - add: Localize spells.

* - add: New blood spells.
2024-03-01 15:44:27 +07:00
deltanedas
ad3f3a5d36 make suicide actions require confirming (#24609)
* add ActionAttemptEvent

* add ConfirmableAction compsys

* make suicide actions confirmable

* use new trolling techniques

* better query and dirty them

* death

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-01 13:48:43 +11:00
Nair Sark
d7dcdb3dba Bug fixes (#151)
* fix: TL random spawners name

* fix: ExplosionSystem admin-chatalert

* fix: some TL

* tweak: RCD can place floor on platings

* typo
2024-03-01 09:05:26 +07:00
Nairod
ba8e92ddc8 Under Toned Tail (#25685)
* Undertoned Tail

* Locale
2024-02-29 15:27:04 -07:00
LordCarve
c47391011d Refactor AME to use ItemSlot for Fuel (#25558)
* Using wrench on AME doesn't first try to put it in.

* Refactor AME to use ItemSlot for fuel.

* Apparently these names want to match.
2024-02-29 16:44:28 -05:00
ThereDrD0
be32d673cb Меньше попапов в чат (#143)
* add: less popups in chat

* fix: less brackets
2024-02-29 17:36:13 +07:00
Rainfey
4e6c59cfe5 Refactor antag rule code (#23445)
* Initial Pass, Rev, Thief

* Zombie initial pass

* Rebase, Traitor

* Nukeops, More overloads

* Revert RevolutionaryRuleComponent

* Use TryRoundStartAttempt, Rewrite nukie spawning

* Comments, Add task scheduler to GameRuleSystem

* Zombie initial testing done

* Sort methods, rework GameRuleTask

* Add CCVar, Initial testing continues

* Might as well get rid of the obsolete logging

* Oops, i dont know how to log apparently

* Suggested formatting fixes

* Suggested changes

* Fix merge issues

* Minor optimisation

* Allowed thief to choose other antags

* Review changes

* Spawn items on floor first, then inserting

* minor tweaks

* Shift as much as possible to ProtoId<>

* Remove unneeded

* Add exclusive antag attribute

* Fix merge issues

* Minor formatting fix

* Convert to struct

* Cleanup

* Review cleanup (need to test a lot)

* Some fixes, (mostly) tested

* oop

* Pass tests (for real)

---------

Co-authored-by: Rainfall <rainfey0+git@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
2024-02-29 17:25:10 +11:00
Ubaser
ad7256750c Remove Eris UI theme (#25673)
add
2024-02-28 23:53:48 -06:00
Firewatch
93d820f315 Syndicate Decoy Bundle + Snap Pops (#25333)
* it works

halilujeah

* toggleable lights

removes a redundant flashlight since you can turn on the balloons to cast light

* final touches

syndicate decoys :trollface:

* touches

it works now

* minor spelling mistake



* minor spelling mistake 2

darn

* adds whistle

commanders now spawn with a whistle around their neck

* yaml linter

luv you linter baby

* smallify the whistle

it was way too big, this has been addressed

* sprite fix

am dummy 👍

* netsync errors

wouldn't compile properly

* forgor

* i suck at yaml

smh

* decoys for all

now both syndicate and traitors can use the decoys, yippee!

* Update meta.json

credit my discord username

* Update uplink-catalog.ftl

* Update decoys.yml

base decoy no longer shows in the entity browser

* immortal gone

balloons have gained mortality
2024-02-28 16:53:46 -05:00