2905 Commits

Author SHA1 Message Date
Alzore
e5f05b735d Remove the blue tint from the health analyzer (#26101)
nomoreblue
2024-03-13 22:04:29 -04:00
wafehling
c0bbbc33c1 Trading Outpost now has half buy-only and half sell-only pallets (#25955)
* Added new Buy & Sell specific cargo pallets

* Remapped trading outpost with new pallets, tweaked texture

* Removed debug message

* Fixed/Compacted conditional checking to let old pallets still work for backwards compatability

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

Alright, updating all the references to it.

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* Changed textures, changed to enum instead of string for pallet type check

* Few minor code tweaks/formatting fixes

* Missed the prototype change

* Update Content.Server/Cargo/Components/CargoPalletComponent.cs

* Update Content.Server/Cargo/Systems/CargoSystem.Shuttle.cs

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-14 10:26:25 +11:00
Aviu00
9871e4e4c1 - add: Ritoka fluff. (#187) 2024-03-13 20:01:01 +03:00
Aviu00
c05a1d09c2 Ling update (#183)
* - add: Augmented Eyesight.

* - add: Dissonant Shriek.

* - tweak: Nuke use delays.

* - tweak: Tweak chemical regeneration and chemical costs.

* - add: Add chitinous helmet.

* - fix: Fix chem regeneration while dead.

* - tweak: Faster fleshmend.

* - add: Void Adaptation.

* - tweak: No lesser form delay.

* - tweak: Lesser form tweaks.

* - tweak: Stasis doafter is hidden now.

* - add: Refund after absorbing.

* - tweak: Some tweaks.
2024-03-13 19:19:30 +03:00
Mangohydra
61b3eb4de0 The lawyer finally gets a stamp (#26012)
lawyer stamp
2024-03-13 18:05:39 +03:00
ThereDrD0
d856995b39 add: add our sprites for rust all rust walls types (#191) 2024-03-13 01:00:24 +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
HitPanda
eba54a3215 [Sponsor] Doxxxom fluff (#188) 2024-03-12 16:29:27 +03:00
rhailrake
99e969efcf ура срем в мастер ура ура ура 2024-03-12 16:34:31 +05: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
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
Ed
d3d9898d2a Recolor detective stamp (#25945)
* Add files via upload

* Update rubber_stamp.yml
2024-03-11 12:57:20 +11:00
Ko4ergaPunk
2a5be69898 Fix chromite chasm sprite (#25819)
* fix

* Remove stripes

* empty
2024-03-09 02:48:03 +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
Decortex
cef8a17726 ATV resprite (#25885)
* Delete Resources/Textures/Objects/Vehicles/atv.rsi/vehicle.png

* Add files via upload

* Delete Resources/Textures/Objects/Vehicles/atv.rsi/Vehicle.png.png

* Add files via upload

* Update meta.json

* Update meta.json

* .
2024-03-07 08:36:00 +03: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
Ko4ergaPunk
0ab4acedeb Post light update (#25814)
* penis

* done
2024-03-06 04:39:47 +03: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
Mr. 27
540c819602 Blood-red monkey hardsuit (#22273) 2024-03-03 23:56:17 -04:00
db920c3942 - tweak: some lobby screens 2024-03-03 14:33:21 +03: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
exincore
c8cc806a8f feat(inventory): Add secondary smart-equip star (#25696)
* feat(inventory): Add secondary quick-remove star

* style: Fix end of file newline

* feat(inventory): Change secondary smart-equip star to silver star

* feat(inventory): Decrease secondary quick-equip star luminosity to better match the primary
2024-03-02 18:57:42 -05:00
Brandon Hu
bc2dee9f70 fix(seizures): remove seizures from the game (#25722)
* fix(seizures): remove seizures from the game

* Reduced animation time to 2 seconds
2024-03-02 15:17:46 -05: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
21000c5b1f Collars
(cherry picked from commit 045439676ee03c51d377d318624d46ff84ae07d8)
2024-03-02 16:25:20 +03:00
rosieposie
55b0cb1934 Additional Signage (#25766)
initial commit
2024-03-01 23:42:06 -07:00
Valtos
39b317a2b4 fuck (#157) 2024-03-02 05:58:15 +00:00
IlyaElDunaev
81b016433f Detective's rubber stamp (#25676)
Stamp Detective
2024-03-01 17:50:17 -05:00
Tunguso4ka
8dedbf22a4 New item: Expensive coat (#25724)
Expensive coat
2024-03-01 16:22:52 -05:00
Remuchi
9430e2d53c Всякое по мелочи (#148)
* fix: у мартышек снова отображается одежда

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

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

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

* add: новые плитки для мапперов
2024-03-01 15:51:17 +07:00
Flareguy
7b9346d2a8 New Space Ruin: Syndicate Dropship (from /tg/) (also adds plastitanium windows) (#25723)
* adds a new syndie space shuttle ruin + plastitanium windows

* the green goomba gaming

* fixe

* visor > gloves
2024-02-29 15:33:35 -07:00
Hanz
0001c23df2 Decal Beautification + Palette Update (#25689)
the meat and potatoes

YEAH
2024-02-29 15:27:25 -07:00
Nairod
ba8e92ddc8 Under Toned Tail (#25685)
* Undertoned Tail

* Locale
2024-02-29 15:27:04 -07:00
Ed
66cf642e56 Colourful curtains (#25684)
* curwa

* fix

* huh

* revert huh

* add fancy white

* resprite hospital

* add suffix
2024-02-29 15:25:41 -07:00
potato1234_x
e2741498b8 Add fill levels to bowls (#25639)
* fills

* contrast
2024-02-29 16:41:14 -05:00
LordCarve
8c6c19c993 Fix PDA home icon (#25721)
Fix PDA home icon.
2024-02-29 20:22:12 +01:00
rhailrake
4cf3f8b0f3 BRING BACK OLD MUSIC (#149) 2024-02-29 17:36:08 +00:00
Martell
bbe2935f84 Random lobby screens (#142)
* - add: Random lobby screens

* - add: animatedLobbyScreen prototypes
2024-02-29 22:52:07 +07:00
Ubaser
ad7256750c Remove Eris UI theme (#25673)
add
2024-02-28 23:53:48 -06:00
MACMAN2003
b1ce9e933b fix stray pixels on over ear headsets (#25675)
stray pixel annihilation
2024-02-28 17:03:43 -05:00
lzk
ec28e777c1 Remake cargo orders to contains flatpacks (#25647)
* Remake cargo orders to contains flatpacks

* whoop

* grounging plamsa
2024-02-28 17:02:02 -05: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
Menshin
9884351101 Add space heaters (#25250) 2024-02-28 10:27:29 -08:00
Aviu00
f2b5517b3d Skrells (#141)
* [add] Мокрые скреллочки

* - add: Skrell slim body type.

* Skrell movement fix, add weight (#72)

* - fix: Fix species.

---------

Co-authored-by: rhailrake <49613070+rhailrake@users.noreply.github.com>
Co-authored-by: TestUnit <UndefinedSignal@users.noreply.github.com>
2024-02-28 21:43:54 +07:00
ThereDrD0
6c242fabf9 add: wooden doshasprites (#136) 2024-02-28 14:00:28 +00:00