Commit Graph

5638 Commits

Author SHA1 Message Date
nikthechampiongr 6d38428b56
Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)
* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect

* Move check up to apply to all actions and do thing I forgor to do before

* Change check into an ActionBlocker check that also checks whether the user is sleeping.

* Make checking for Consciousness the default for actions

Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.

* Fix typos my beloved

I had an unbelievable skill issue

* Fix major skill issue

(cherry picked from commit 22e9d6562f21bdd4f0962d6e3b6fcdd81bb4c253)
2024-03-24 00:01:51 +01:00
Plykiya 60b23640c5
Adds craftable ducky slippers (#26138)
* Craftable ducky slippers

* fix node

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>

(cherry picked from commit 6694f92171ad8d6465b8c8403bf863ba66a75b74)
2024-03-23 23:59:51 +01:00
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
potato1234_x c8a02d666f
makes closets/lockers better (#24942)
* hmngm

* fix

(cherry picked from commit e94fba5f702820588ad358a1824d67920fd399f8)
2024-03-23 23:58:16 +01:00
vanx 678468cc05
Suit slot weapon consistency + visuals (#26152)
suit slot my beloved

Co-authored-by: vanx <#vanxxxx>
(cherry picked from commit 6c239890c5c63c2e058fe9d7dfddcd36e25ca221)
2024-03-23 23:52:02 +01:00
Ko4ergaPunk 519573369b
New wooden furniture (#26182)
* ю

* Fences

* bench, stairs and fence shadow

* small gate desc

* empty

* empty

* destructible

* price fix

(cherry picked from commit 909b2aaa2d5976122f17f9e4fe6ce1a1389dc619)
2024-03-23 23:51:40 +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
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
Danger Revolution! 0271f2ac35
Fix Moth not eating Jumpskirts (#976)
* do the chnage

* Revert "do the chnage"

This reverts commit f691377136.

* Update base_clothinguniforms.yml
2024-03-17 17:45:11 +00:00
Danger Revolution! e2d21fe867
Fix #974 (#975)
Update jumpskirts.yml
2024-03-17 17:31:10 +00: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
Ed 58e6820428
SlowContactsSystem to SpeedModifierContactsSystem mini rework (#26110)
* rework

* update logic

(cherry picked from commit c35ff87e146f0cda7c10782f4ab80b784b51e5fe)
2024-03-17 15:11:29 +01:00
Adrian16199 709b379c88
Gives glue tag to crazy glue (#26154)
(cherry picked from commit 209846b18a0b22e60c520ee98f7afcfa08a102a8)
2024-03-17 15:11:27 +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
Velcroboy 53cbe12642
Change collision mask of canisters to allow passing through cargo flaps (#26193)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit 03b5c21b6e4d0efc70e0172690d9d2ec02d7a711)
2024-03-17 15:11:19 +01:00
Mr. 27 c45cb7f84f
Small species melee weapon change (#26183)
* inital

* Update animals.yml

(cherry picked from commit 0a8def1ea2dc4b7aee297098b3b50a7367f3c4d1)
2024-03-17 15:11:12 +01:00
Hannah Giovanna Dawson 385a8bd07a
SS14-12462 Nerf food and drink vending machines (#25999)
* SS14-17183 Nerf vending machines

Vending machines provide too much food
(and drink) at the moment to the crew,
robbing the chef/bartender of a reason
to exist, and robbing the janitor of a reason
to want to refil vending machines early in
the round.

This PR adds a new "initialStockQuality" field
to vending machines and sets it at 0.33 for almost all
food and drink vendors. The intent at the moment
is to drop food and drink vending machine stocks
by somewhere around a half - two thirds of the time,
about two-thirds of the stock of a given item will be
missing.

This number can be tuned to discourage people relying
on vending machines and make round start
a bit more variable when hunting noms.

* Add comment to InitialStockQuality.

* Update Content.Shared/VendingMachines/VendingMachineComponent.cs

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
(cherry picked from commit 41093ab03cc6a643ee7721de3567963b34fe8e54)
2024-03-17 15:10:44 +01:00
Ed b9f41c2d48
Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" (#26135)
* ignore

* doc

(cherry picked from commit 4aa72af574cc7a3370085fb70831fbde1df29077)
2024-03-17 15:10:41 +01:00
Plykiya 575d169605
Sleep on Stasis Beds (#26129)
* eepy stasis bed

* Make healing 100x worse because it's funny

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
(cherry picked from commit 5912b062503841ad8adc6a4a959f97670063f1fb)
2024-03-17 15:10:32 +01:00
Nairod 8ec5d2ba9b
Red Neck Gaiter (#25891)
* Red Neck Gaiter

* Minor Meta Mistake

(cherry picked from commit 1938768ea69ad2f69758036816142a205552eb63)
2024-03-17 15:10:26 +01:00
Ed a74bbc0fc0
Fashion is my profession - Procedural jumpsuit variants (#25888)
* add color field to clothing layers

* add support to randomsprite

* bababa

* finalize spriting work

* add to game

* fix

* remove space

* edit patelle, +1 decor variant

* added only pants, some sprite fix

* inflation

* fix mixed

* not tested commit

* Revert "not tested commit"

This reverts commit 4a904df3452263e87c9cb819ab5d8cf411ebe468.

* naked human is fun

* update

* add new style

* some sprite pixel tweak

* Update meta.json

(cherry picked from commit 986ac589b44687fd2f3b71da00a52434db75abe3)
2024-03-17 15:09:40 +01:00
shamp e9bdb23d28
Added cheap sunglasses into ClothesMate (#25479)
* cheap sunglasses

* Update glasses.yml

* Update Resources/Prototypes/Entities/Clothing/Eyes/glasses.yml

* Fix price

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

(cherry picked from commit d370f16e04fc12c8fa2b89c41c3fce12225334b4)
2024-03-17 15:08:53 +01:00
deltanedas 76330eae64
add more carp plushies (#26081)
* carp plushie textures

* add the plushies

* add plushies to spawners

* rainbow carp and make special plushies rarer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
(cherry picked from commit f8305a26a9bd1dc080daca8f45f7289829b91682)
2024-03-17 15:08:11 +01:00
Brandon Hu 99a46a3be1
Agent IDs default to passenger icon (#25993)
(cherry picked from commit 0aee4bf3479df41583a2e7101ab2028f0db2d1aa)
2024-03-17 15:08:01 +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
Tayrtahn 5e95b01dd6
Split smoke grenade sound into two parts (#26095)
* Split smoke grenade sound into two parts and converted to mono

* Restore old sound for admin trigger effect

(cherry picked from commit 696f97f78ecfb86e4483148588a52e39bf27073c)
2024-03-17 15:07:15 +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
lzk 16eee4e608
Fix some tags for prototypes (#26088)
* Fix some tags

* oop

(cherry picked from commit 2a1d6e0ae0513445e82f683bf323bf65ebe5397a)
2024-03-17 15:06:06 +01:00
wafehling 17ca360528
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>
(cherry picked from commit c0bbbc33c19eafcc8defaa7f1ec2df42e485b435)
2024-03-17 15:06:02 +01:00
lzk c7ea45da59
More good looking inventory part 2.2 (instruments version) (#26090)
(cherry picked from commit 91aa6445714d6b833474fcb911c4c8555a54f799)
2024-03-17 15:05:57 +01:00
lzk ba79603f62
Some more whitelists for belts (#26085)
* Allow surgery tools in medbelt

* add lil more changes

(cherry picked from commit 2b5a75ba6619b9fdd6c4f7e17a18d2af85167505)
2024-03-17 15:05:54 +01:00
Gyrandola d66335cfbd
Make fireaxe & shotgun cabinets destructible (#25962)
* Update fireaxe_cabinet.yml

* added min(75) and max (100) dmg threshold

100 dmg destroys the axe as well.

* made the cabinet tougher

(cherry picked from commit 6574681bcb88e9c524b998c525d1980e88884e96)
2024-03-17 15:05:53 +01:00
Errant 1f519737e2
Fix vox custom sprites (#25989)
fix vox specific sprites

(cherry picked from commit 8a77722f91a94846f0027f56b8d8f2ec76254d81)
2024-03-17 15:05:50 +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
icekot8 942e02d0e7
foxes are now neutral🦊 (#25992)
foxes became neutral

(cherry picked from commit 86ab7a10743bd98d1f187e7158cb316e106ea3b9)
2024-03-17 14:59:11 +01:00
Velcroboy a5c824d375
Fix placement mode on chairs (#26041)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit bcc147634af1fea7b5f53f18d136f44ed46cb053)
2024-03-17 14:59:10 +01:00
PursuitInAshes ad34720b58
Contraband Storage Crate (#25974)
* Contraband Storage Crate

* Better description

* Better Communication of Purpose

* Update Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 49c819373919d6ad2c7e1d802025782ecdce370b)
2024-03-17 14:59:05 +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
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
Cojoke 839fa2e5fb
Adds Senior role drip to the Uniform Printer. (#25668)
Adds Senior role drip to the Uniform Printer.

(cherry picked from commit af57006427d11b4bbc99983a983e5c31a4ee0d8b)
2024-03-17 14:56:01 +01:00
Vyacheslav Kovalevsky 4b446c2e62
Fix cream pie bomb when eaten or sliced (#25928)
* fix bomb activation when eaten

* no swap / no eject

* activate when sliced

(cherry picked from commit 0d0edbba4a1c2af7ecef3318b5f9fe287a63fab5)
2024-03-17 14:55:56 +01:00
Velcroboy 2c56535977
Add fancy table spawner (#26044)
* Add fancy table spawner

* fix icon

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
(cherry picked from commit f5f5eebeeeee005a955ebd2814b4b9d6204e72ef)
2024-03-17 14:55:50 +01:00
Gyrandola 40d3100521
Fix Sky Blue carpet making red tables (#26049)
* created and added CarpetSBlue tag

* reverting unnecessary de-indentation

* Update carpets.yml

(cherry picked from commit 559d7ac59379c4c01faafaec3213380d8ae0be9f)
2024-03-17 14:55:43 +01:00
SlamBamActionman 533fe8663e
Remove recycling for Syndicate implanters (#26047)
Removes the Trash tag

(cherry picked from commit a8e1489ddb56450cb3a689b95c4c1b407fe3c136)
2024-03-17 14:55:39 +01:00
FungiFellow 3059e29326
Improvised shell crafting recipe (#25545)
* Changed Projectile Sprite to Shard

* Removed Notes on Recipe

* Made Recipe

* Added a space

* Update improvised.yml

* Update shotgun.yml

* Removed Note

* Reduced needed matches from 8->6

* Update improvised_shotgun_shell.yml

* Matchbox fix didn't work

* Reduced glass needed from 5-4

* Added backspace

* Update Resources/Prototypes/Recipes/Crafting/Graphs/improvised/improvised_shotgun_shell.yml

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
(cherry picked from commit 6260e4b35b829485149206636861bb7402488724)
2024-03-17 14:55:02 +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
Mr. 27 ffb3cfd682
kobolds no longer die at 40 hp (#25984)
* me

* change

(cherry picked from commit ad99564b3e1fd25f6945f1627d1602b9c475e127)
2024-03-17 14:54:43 +01:00
Ubaser a85c4c2c75
Space damage now causes heat along with blunt (#25770)
* add

* heat not burn?

(cherry picked from commit c2d52e45404f09b95f87dbb8e12d2a0c7217a023)
2024-03-17 14:54:08 +01:00
SlamBamActionman f932eddfc2
Add "Juice that makes you Weh" to moths eating Lizard plushies (#26003)
Weh

(cherry picked from commit 6d1f07a375a5d3f973d279a5d356b1f185d07cd5)
2024-03-17 14:53:58 +01:00