Commit Graph

7202 Commits

Author SHA1 Message Date
wafehling
4357b9ef08 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
2024-03-17 13:06:16 -04:00
Whisper
f259f2f3a2 Update blood related tips! (#25809) 2024-03-17 22:39:11 +11:00
Ilya246
90be67e679 Add decoy syndicate bomb to uplink (#26034)
bombening
2024-03-17 13:31:41 +11:00
Ed
c35ff87e14 SlowContactsSystem to SpeedModifierContactsSystem mini rework (#26110)
* rework

* update logic
2024-03-17 13:27:22 +11:00
Adrian16199
209846b18a Gives glue tag to crazy glue (#26154) 2024-03-17 13:22:11 +11:00
21Melkuu
1d72d0777b 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>
2024-03-17 13:21:13 +11:00
Velcroboy
03b5c21b6e Change collision mask of canisters to allow passing through cargo flaps (#26193)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-16 20:55:32 -04:00
Mr. 27
0a8def1ea2 Small species melee weapon change (#26183)
* inital

* Update animals.yml
2024-03-16 22:23:53 +03:00
deltanedas
6aa77700c1 less fish in maints (#26156)
pro

Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-16 16:49:07 +03:00
Plykiya
23e6d537a4 Round start Ion storms (#26165)
* Round start Ion storms

* five

* Update Resources/Prototypes/GameRules/events.yml

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2024-03-16 14:47:13 +11:00
Hannah Giovanna Dawson
41093ab03c 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>
2024-03-15 19:28:00 -04:00
Ed
4aa72af574 Convert "IgnoreWeatherComponent" into "BlockWeatherComponent" (#26135)
* ignore

* doc
2024-03-15 18:36:09 -04:00
deltanedas
d87be642ee fix eggsplosion (#26146)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2024-03-15 21:56:01 +03:00
Plykiya
5912b06250 Sleep on Stasis Beds (#26129)
* eepy stasis bed

* Make healing 100x worse because it's funny

---------

Co-authored-by: Plykiya <plykiya@protonmail.com>
2024-03-16 01:00:03 +11:00
Nairod
1938768ea6 Red Neck Gaiter (#25891)
* Red Neck Gaiter

* Minor Meta Mistake
2024-03-15 21:11:40 +11:00
Ed
986ac589b4 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
2024-03-15 18:37:12 +11:00
metalgearsloth
3c814f4652 Freeze clothesmate (#26125)
People will do anything but add uniform dying.
2024-03-15 01:22:04 -06:00
shamp
d370f16e04 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>
2024-03-15 14:56:33 +11:00
deltanedas
f8305a26a9 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>
2024-03-15 13:58:17 +11:00
lzk
0fdb551c3d Sort all tags in aplhabetical order (#26114)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2024-03-15 09:40:51 +11:00
Brandon Hu
0aee4bf347 Agent IDs default to passenger icon (#25993) 2024-03-14 12:09:46 -04:00
nikthechampiongr
dce24dfd03 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.
2024-03-14 11:55:14 -04:00
Ghagliiarghii
c07213c247 Democratize C-20r SMG Magazines (#26086)
Previously the C-20r magazines were only available for nukies to purchase, but regular syndicate agents could purchase the actual C-20r bundle to get the gun. This strikes me an inconsistent.
2024-03-14 11:48:05 -04:00
Tayrtahn
696f97f78e 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
2024-03-14 11:46:04 -04:00
Mr. 27
3cb1c585c5 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>
2024-03-14 15:27:08 +11:00
lzk
2a1d6e0ae0 Fix some tags for prototypes (#26088)
* Fix some tags

* oop
2024-03-14 10:27:26 +11: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
lzk
91aa644571 More good looking inventory part 2.2 (instruments version) (#26090) 2024-03-13 22:03:34 +03:00
lzk
2b5a75ba66 Some more whitelists for belts (#26085)
* Allow surgery tools in medbelt

* add lil more changes
2024-03-13 21:55:26 +03:00
Gyrandola
6574681bcb 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
2024-03-13 18:09:06 +03:00
Errant
8a77722f91 Fix vox custom sprites (#25989)
fix vox specific sprites
2024-03-13 18:06:37 +03:00
Mangohydra
61b3eb4de0 The lawyer finally gets a stamp (#26012)
lawyer stamp
2024-03-13 18:05:39 +03:00
icekot8
86ab7a1074 foxes are now neutral🦊 (#25992)
foxes became neutral
2024-03-13 18:02:48 +03:00
Velcroboy
bcc147634a Fix placement mode on chairs (#26041)
Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-13 17:45:28 +03:00
PursuitInAshes
49c8193739 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>
2024-03-13 21:10:12 +11:00
Krunklehorn
674b42b3a0 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
2024-03-13 21:03:14 +11:00
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
Cojoke
af57006427 Adds Senior role drip to the Uniform Printer. (#25668)
Adds Senior role drip to the Uniform Printer.
2024-03-13 19:45:33 +11:00
Vyacheslav Kovalevsky
0d0edbba4a Fix cream pie bomb when eaten or sliced (#25928)
* fix bomb activation when eaten

* no swap / no eject

* activate when sliced
2024-03-13 19:36:08 +11:00
Velcroboy
f5f5eebeee Add fancy table spawner (#26044)
* Add fancy table spawner

* fix icon

---------

Co-authored-by: Jeff <velcroboy333@hotmail.com>
2024-03-13 09:21:51 +03:00
Gyrandola
559d7ac593 Fix Sky Blue carpet making red tables (#26049)
* created and added CarpetSBlue tag

* reverting unnecessary de-indentation

* Update carpets.yml
2024-03-12 19:03:04 -07:00
SlamBamActionman
a8e1489ddb Remove recycling for Syndicate implanters (#26047)
Removes the Trash tag
2024-03-12 19:02:36 -07:00
NakataRin
b49f77f9cd skeleton minplayers restriction (#26050) 2024-03-13 12:00:15 +11:00
FungiFellow
6260e4b35b 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>
2024-03-13 10:52:32 +11:00
UnicornOnLSD
76db710a1c new haircut alternative (brought back old one) (#25935)
added crew cut 2 wew
2024-03-12 14:47:29 -04:00
Mr. 27
ad99564b3e kobolds no longer die at 40 hp (#25984)
* me

* change
2024-03-12 14:43:21 -04:00
Ubaser
c2d52e4540 Space damage now causes heat along with blunt (#25770)
* add

* heat not burn?
2024-03-12 13:38:39 +11:00
SlamBamActionman
6d1f07a375 Add "Juice that makes you Weh" to moths eating Lizard plushies (#26003)
Weh
2024-03-12 02:05:25 +03:00
Baptr0b0t
7bdfd4cfc0 FIX Criminal SecHud icon Rsi path BUG (#26001)
FIX BUG
2024-03-11 10:45:30 -04:00