Commit Graph

1967 Commits

Author SHA1 Message Date
brainfood1183 53b2d209b0
Spray Paint (Review Ready) (#23003)
* Spray Paint (Draft)

* paint colors, paints in maints loot, cargo crate of paints.

* fix

* remove paint (sort of)

* moved paintcleaner into own system

* Moved paint to server (had to unfortunately)

* doafter now breaks when moving away.

* cant paint mobstatecomp

* loads of fixes

* fixes

* fixes

* nopaintshadercomp

* fixes

* fix

* use locale for paint remove string

* remove nopaintshadercomponent and use blacklist

* remove enabled.true from visualizer

* paint doafter event.

* add verbs for paint and remove paint and icon for paint verb.

* fixes

* no longer replaces shader when shader exists.

* replace forloop with foreach, check shader before adding and removing.

* paint doafter now separate so no copy paste code

* Entities in sprayed targets item slots are also now correctly sprayed.

* fix

* fix

* fix airlock psray painter now removes painted before painting door.

* spray paints now use openablecomponent.

* fix

* fix damn accesstypes.

* fix

* fix

(cherry picked from commit e4d5e7f1aebfc37b1bc3453fdb39578f3897b6a1)
2024-03-23 23:59:20 +01:00
Leon Friedrich 1aefd9c6a1
Add reckless replay load button (#26212)
* Add reckless replay load button

* A

* More descriptive button

(cherry picked from commit 646f7e07a83816875157c1a445af445d2b72dfae)
2024-03-23 23:56:14 +01:00
wafehling 14b72975df
Added 18 new bounties to cargo (#26160)
* Added 18 new bounties + tags, couple of balance tweaks

* Oops, 2 corn tags.

* Fixed another duplicate from merge conflict

* Fixed all arbitrage issues

* Removed metamorphic glass/manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Removed manly dorf bounty

* Changed hiviz tag, removed commented out bounty

* Removed extra line

* Change HiViz tag

* Removed unused tag

* Removed LaceupShoes, changed HiViz

* Changed flavor text for fruit bounty

* Removed live mouse bounty

(cherry picked from commit 4357b9ef08fee0e08c4fdf4eeef714fa8eb38112)
2024-03-23 23:51:36 +01:00
Velcroboy 2ad986dddd
Adds pre-set warp points (#991)
* Adds pre-set warp points

* Trim yaml

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
2024-03-21 20:35:14 -05:00
rosieposie 304fdcd356
Add Corspman Access & Airlocks (#892)
* add corpsman access & mantis maint airlock

* fine

* accessible guy

---------

Signed-off-by: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
2024-03-19 13:13:13 +01:00
Debug 9ad761ae18
Lunchboxes! Revival (#980)
* Adds Sprites, courtesy of Noctrn

* Adds lunchboxes

* Adds the "notes from mom" that can spawn inside

* Adds to vendors.

* shrunk storage by one row

* update the locale to have "note from mom"

* new sprites :O

* Update lunchbox.yml to have higher price

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* Update chefvend.yml

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* why the fuck did they remove tap.ogg?

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>

* update credits

* One RSI, many states

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
Co-authored-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
2024-03-19 12:39:39 +01:00
Debug fed10b87a4
Merge pull request #973 from DebugOk/2024/03/15-merge-upstream
Merge upstream
2024-03-17 18:09:43 +01:00
Ilya246 0387a58d2a
Add decoy syndicate bomb to uplink (#26034)
bombening

(cherry picked from commit 90be67e67956c7dd0348ddd0688d7d3ab614cb99)
2024-03-17 15:11:31 +01:00
21Melkuu 603582ebc1
Add explosion-proof backpack to uplink (#26187)
* Backpacks

* move to wearables

* Update Resources/Prototypes/Catalog/uplink_catalog.yml

* Update Resources/Prototypes/Entities/Clothing/Back/backpacks.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 1d72d0777b662a2cb58350d666042da17c18d43f)
2024-03-17 15:11:26 +01:00
nikthechampiongr 554aa0774b
Make radio jammer block suit sensors (#26046)
* Make radio jammer block suit sensors

* Fix stupid

Use CancellableEventArgs instead of doing what the hell I was doing before.

* Address Reviews.

Change the event from a CancellableEntityEventArgs to a ByRefEvent.

(cherry picked from commit dce24dfd03b3ddfe1044297edf9d35bc9f75c523)
2024-03-17 15:07:58 +01:00
Mr. 27 d7c48b4028
Pipebombs and IED rework (#25705)
* inital

* 2-9

* add crafting function, rename ied to fire bomb

* add firebomb ignition

* fikss

* change damage values

* add note

* fix tests i think

* ok

* good

* Review

* warning

---------

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit 3cb1c585c53f694f5ceb9720057bb765673970ec)
2024-03-17 15:06:54 +01:00
Mangohydra 0603f3ec77
The lawyer finally gets a stamp (#26012)
lawyer stamp

(cherry picked from commit 61b3eb4de0460bf3ca44008ae6cff87442d6b865)
2024-03-17 15:02:28 +01:00
Debug 000d55c932
Revert "Psychologist & Lawyer stamp (#849)"
This reverts commit 344aa7bff7.
2024-03-17 15:02:07 +01:00
Krunklehorn 1f9fa51a56
Fix Butcherable handling, ItemSlots for clown shoes (#25661)
* Fix butcherable handling

* ItemSlots for clown shoes

* Return if handled

* Handle if popup

* Whitespace, spoons are metal

* Zero damage plastic utensils, blacklist by metal+melee

* Hmmm truthy

* Plastic knives are knives too, just use that

* Delete unused tag

* Always true if doAfter

* Raw rat meat should be sliceable too

(cherry picked from commit 674b42b3a0ab9fa607887c1401f38ca1f8bb3911)
2024-03-17 14:58:56 +01:00
veprolet ac09dc586c
Cycle injector transfer amount on alt. use (#25566)
* Add toggle verb for injector transfer amount

* Fix injector verb priority scalability

---------

Co-authored-by: veprolet <>
(cherry picked from commit ad6ac73f6f41d1cbd3fe80a43c8bf4b83e03f392)
2024-03-17 14:58:50 +01:00
SlamBamActionman 64738a3d86
Changed names of uplink categories and swapped around items (#25079)
* Changed names of uplink categories and swapped around items

* sloth feedback

(cherry picked from commit aabf030515c2e6ce5fe174e8b91d80f67bb43413)
2024-03-17 14:58:42 +01:00
FungiFellow 32a979433d
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

(cherry picked from commit 471dfed44531f3d2541c0b1050dd425e5ec6c4b1)
2024-03-17 14:56:10 +01:00
UnicornOnLSD 2b08a4ceec
new haircut alternative (brought back old one) (#25935)
added crew cut 2 wew

(cherry picked from commit 76db710a1c5fe4c86674a27c282b4f84cb35446b)
2024-03-17 14:54:51 +01:00
Alice "Arimah" Heurlin bb4cb6d28a
Remove random Cyrillic characters from locale files (#26043)
(cherry picked from commit ffd52b24ff9bbe33eab30aec1b19d4c1fbb05245)
2024-03-17 14:54:39 +01:00
Arendian 13c6eeb87a
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

(cherry picked from commit 60b9d89e4dbdd8aaad4992a105628297d9480617)
2024-03-17 14:52:22 +01:00
Errant 572e7b186f
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

(cherry picked from commit 84a07315dde09c2cff716f9f3a73f493b6b56cc7)
2024-03-17 14:52:17 +01:00
Nemanja 8950fd6a0f
Add a toggle for colorblind friendly progress bar colors (#25318)
* Add a toggle for progress bar colors

* yeah this thing

* PJB review

* optimization

(cherry picked from commit f3f4616c49317898aeeff304160b0b50df9ee851)
2024-03-17 14:46:26 +01:00
MODERN ee8e5b4f2f
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

(cherry picked from commit 6e38b992cfc607e09178efc178b86f35152f0cde)
2024-03-17 14:46:09 +01:00
AlexUm & XGabriel08X d36b0b69e4
Barber scissors in uplink and chameleon bundle. (#25920)
scissors

uplink catalog localization and just catalog update, with adding scissors to the chameleon set

(cherry picked from commit 7af183ec720833aaa49cb8db3c7b37d14dd50798)
2024-03-17 14:43:40 +01:00
Alzore 55483dca32
Vegan Meatball (#24650)
* veganmeatball

* testedthis

* moreplant

(cherry picked from commit 5f61380209146a83be27270372c4c54d62b007b2)
2024-03-17 14:41:35 +01:00
beck-thompson 41a50c5908
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>

(cherry picked from commit 4b359466ccf1cfb7642a048dc142d12ffbefc3e9)
2024-03-17 14:41:27 +01:00
Velcroboy 5acb90a4eb
Add magnet pickup system from Frontier (#949)
* Add magnet pickup system from Frontier

* No wl needed here

* Add translation strings

* Making code optimizations, missing component on upgraded smelter

* Update lathe.yml

---------

Co-authored-by: Velcroboy <>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2024-03-17 14:38:11 +01:00
Danger Revolution! c7f9819fb6
minor lawset fixes (#953)
* minor law changes to stop shitters & reduce confusion

* Update laws.ftl

* space at the end

---------

Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2024-03-11 18:56:12 +01:00
Velcroboy fd09635098
Adds Delta V station beacons (#767)
* Adds Delta V station beacons

* Duped

* Add corpsman

* Added mantis and shortened names

* Remove escape pod beacon

* Tidy, remove duplicate changes, and update

* Missed Mysta

* remove notes

---------

Co-authored-by: Velcroboy <>
2024-03-11 16:13:32 +00:00
metalgearsloth f102e8ff75
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

(cherry picked from commit c5486873db0d6826122eb1f30007e392fc101082)
2024-03-08 12:54:53 +01:00
metalgearsloth fa61952f51
Add trade stations (#23863) 2024-03-08 09:52:50 +01:00
BonkTrauma 9b783aff90
Prison communications (#715)
* Finished

* Revert "Finished"

This reverts commit 4ab2d612a8.

* Finished actual

* Update general.yml

* Update general.yml

* making changes

added prison coms to security key and removed it from hos headset

* I think this is correct

* Move localisations into Delta-V directory

* file fix

* file location change

---------

Co-authored-by: Nova <stellar_novas@riseup.net>
2024-03-07 22:22:48 -05:00
Guess-My-Name 344aa7bff7
Psychologist & Lawyer stamp (#849)
* new stamps

* add stamps to cmos locker and lawdrobe

* adds stamps to starting gear of psychologist and lawyer

* move locale to deltav
2024-03-07 22:14:24 -05:00
Danger Revolution! d50483485b
More Borg Lawsets (#706)
* Add Station Efficiency Lawset from YogStation

* Adds Clown & Cowboy LawSets

* adds research lawset & shuffles laws

* adds janitor lawset

* adds engineer lawset, moves station efficiency to a ion storm lawset

* Medical Lawset

* Apply lawsets to Borg Chassis'

* Medical Lawset

* errors >:(

* Adds the Druid and Tyrant Lawsets

* adds the chaplain lawset

* adds chaplain (& maybe clown) to ion storm pool

* chaplain locale >:(

* adds reporter & live and let live lawsets

* and their locale >:(

* and their chance to spawn >:(

* drone --> cyborg

* dungeon master, silicon police, nutimov

* paladin lawset

* Update silicon-laws.yml using the horrific git mobile interface

* i don't really like the engineering lawset, so replaced until further notice

* moved things to delta-v places

* more fixing

* Update silicon-laws.yml

* adds clown lawset to ionstorm pool

* added "ObeysTo" fields as per Wizden merge

* spelling mistake >:(

* added custom "obeyTo" for Cowboy

* adds delta-v tags

---------

Signed-off-by: Danger Revolution! <142105406+DangerRevolution@users.noreply.github.com>
Co-authored-by: DangerRevoltion <142105406+DangerRevoltion@users.noreply.github.com>
2024-03-07 23:22:42 +01:00
Арт ac57098d2a
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.

(cherry picked from commit 2ba28cc3d21034c93d8b2c4486b9a158d4be9618)
2024-03-07 01:28:47 +01:00
Pieter-Jan Briers e01969b0fd
Paper save button, back to ctrl+enter save. (#25870)
* Revert "Change keybindings for paper (#25853)"

This reverts commit 4b56996fcdbf88581d31d4c8aeb184f0c4c23309.

* Add a save button to the paper editing UI instead.

(cherry picked from commit d385c1bb2327da4fa6bf83d1813c44295eb8efdd)
2024-03-07 01:28:18 +01:00
MACMAN2003 bbc0f1e15f
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

(cherry picked from commit f0e8695a91b787c8107ebf198309d92159463dc0)
2024-03-07 01:26:19 +01:00
Plykiya 38719830b6
Syringe QoL improvements (#25480)
Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 4f7ff56e87d78a2acc0936466f83a6b841ee8fea)
2024-03-07 01:24:05 +01:00
LordCarve 297c97d556
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.

(cherry picked from commit 06d755a860fa60dd393bfece6495109af8b60c21)
2024-03-07 01:19:38 +01:00
Tayrtahn b97afd8346
Add prediction for puddle and spillable examines (#25794)
Prediction for puddle and spillable examines

(cherry picked from commit 4943151111c8db9ac94701128b08f857b3abd3e6)
2024-03-07 01:19:36 +01:00
lapatison 4444cce972
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>
(cherry picked from commit 4f7facbd73270d38efce72fbb9d0dabd1f432dd2)
2024-03-07 01:18:30 +01:00
IlyaElDunaev c3a564f3eb
Detective's rubber stamp (#25676)
Stamp Detective

(cherry picked from commit 81b016433fea9f67645776a42ca1762350bfce2b)
2024-03-07 01:15:30 +01:00
deltanedas 2ffd042e9b
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>
(cherry picked from commit ad3f3a5d360be6f7c8acb9c7753b45653a28cc0f)
2024-03-07 01:12:21 +01:00
Nairod 8f62b1e86e
Under Toned Tail (#25685)
* Undertoned Tail

* Locale

(cherry picked from commit ba8e92ddc80d66d627384fe44ef47724a082b4cd)
2024-03-07 01:08:16 +01:00
LordCarve ba36e5195f
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.

(cherry picked from commit c47391011d0f7f56dfcba8e4db348f0dc0d58c09)
2024-03-07 01:08:04 +01:00
Rainfey b9d2f5a409
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>

(cherry picked from commit 4e6c59cfe51211064d79a727cc2d37c2a2f55a2c)
2024-03-07 01:06:59 +01:00
Ubaser 636c59a658
Remove Eris UI theme (#25673)
add

(cherry picked from commit ad7256750c5ccb8a5b1025d287dae1d1c507f78e)
2024-03-07 01:06:04 +01:00
Firewatch 4e00e2e699
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

(cherry picked from commit 93d820f315c015eca17444bb8459f96f57381acd)
2024-03-07 01:05:03 +01:00
Menshin 37c7ac7931
Add space heaters (#25250)
(cherry picked from commit 98843511014e1b5fce34b7e1215179dd3d0f94c8)
2024-03-07 01:05:02 +01:00
nikthechampiongr de1b023689
Fix cuff interruption messages (#25677)
(cherry picked from commit 221719c27da59dbfee8b091b623e9734fcb987c0)
2024-03-07 01:04:58 +01:00