Commit graph

10176 commits

Author SHA1 Message Date
banumbas
244a6f13d8
сас со с арта форбицы (#1266) 2025-02-05 03:44:41 +03:00
Vigers Ray
22933ed984 фикс ClusterSyndyFlashGrenade и SyndyClusterGrenade 2025-02-05 03:43:36 +03:00
Vigers Ray
cfbd768f53 ы 2025-02-05 03:40:19 +03:00
Vigers Ray
6bf41664ba красота 2025-02-04 05:40:07 +03:00
Vigers Ray
2efb92ec22 фиксы линтера 2025-02-04 04:52:12 +03:00
Vigers Ray
4c5854ea7b Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Server/Administration/Systems/AdminVerbSystem.Smites.cs
#	Resources/Audio/Machines/attributions.yml
#	Resources/Locale/en-US/_strings/administration/smites.ftl
#	Resources/Locale/en-US/_strings/reagents/frostoil.ftl
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/cart.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chapel.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/chefvend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/coffee.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/condiments.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/engivend.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/medical.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/scidrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/wallmed.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Guns/Shotguns/shotguns.yml
#	Resources/migration.yml
2025-02-04 04:18:31 +03:00
Vigers Ray
8de23c502f камбек бедных предателей 2025-02-04 04:13:54 +03:00
KaiserMaus
a8fe366b3f
Случайное Событие Малый Шаттл Пиратов (#1238)
* UnknownPirateShuttle Init

* Пластитан вместо шахтерских
2025-02-04 04:07:00 +03:00
banumbas
a956751091
Дарвиний (#1210)
* Был добавлен дарвиний

* мелкие фиксы

* ааа наконец та

* Исправил ошибки, добавил вульп и фелинидов.

* багфикс ошибки в консоли

* фикс перевода и линтера

* заебало чё то

* фелиниды ликвидированы.

* Update cargo_medical.yml

---------

Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2025-02-04 04:02:55 +03:00
Kendrick
4cf9109476
BSKendrick (#1228) 2025-02-04 04:00:05 +03:00
Shiranuy
736244a95a
Кластерная минибомба и кластерная флешка под видом связки минибомб синдиката (#1230)
* Add Cluster SyndyFlash Grenade

* Add Cluster SyndyFlash grenade 'Godkiss'

* Добавил настоящую кластерку в аплинк

* описания перепутал

---------

Co-authored-by: Shiranuy <yudochkin987@mail.ru>
2025-02-04 03:59:49 +03:00
Kendrick
003ef31104
ImplantFix (#1231) 2025-02-04 03:59:26 +03:00
KaiserMaus
578fdbbea3
[Балансировка] Дробовики (#1232)
* ShotGun Tweaks

* Sawn TrenchGun

* forgen about 1014

* Тренчган в шкафчиках вместо Каммера

* Fix
2025-02-04 03:57:32 +03:00
KaiserMaus
2ab5b28c27
Пиратский Мех и Баллончик краски под него (#1234)
* Pirate

* Event

* Revert Hardsuit and Fix Locale

* Pirate Mech Big Yarrk

* Revert "Event"

This reverts commit 1030415db9a59bf18d6f77547c1f95186c4de49c.

* Revert "Pirate"

This reverts commit 062238d6fe49f4cfc735977cf325f0b850a978b0.

* Revert "Revert Hardsuit and Fix Locale"

This reverts commit 2f546cdd7ab3f9814889d89172d97574556d35a9.

* Лишнее

* Locale

* Fix WhiteList Guns

* Oops

* Spawner
2025-02-04 03:56:28 +03:00
Kendrick
3322bb06ad
KendrickTurtleneck (#1239) 2025-02-04 03:55:33 +03:00
KaiserMaus
6564e74a48
Fix and Tweaks (#1243) 2025-02-04 03:55:24 +03:00
KaiserMaus
8a3a60a247
Lathe MechPaint (#1244) 2025-02-04 03:55:11 +03:00
Kendrick
a45cb8e2d6
GaloshesKendrick (#1245) 2025-02-04 03:54:43 +03:00
KaiserMaus
165d42acd1
Nerf Incendiary and Rubber (#1255) 2025-02-04 03:47:12 +03:00
KaiserMaus
e7f9e7bc21
Агенты! Вы больше не Элита! (#1257) 2025-02-04 03:43:55 +03:00
Vigers Ray
cd87f5527b починил говно 2025-02-04 03:42:10 +03:00
Smith
2ffe539ba2
contrabandInventory Changes (Fixed) (#32934)
* Reimport of .yml files, edit to medidrobe.yml

* Fixed typo for "Richard" in AutoDrobe contrabandInventory

* contrabandInventory Revision

* Add a spare bible to PietyVend (#32363)

Update chapel.yml

* Bible to normal inventory, not contraband

* Balance changes based on maintainer feedback.

* VendoMat change to Proximity Sensor and Borg Arm.

* Revert "VendoMat change to Proximity Sensor and Borg Arm."

This reverts commit 44c68daaaedeea26f9376db7f65d1e01771a761e.

* PR Rebase, Fixing Reversion

* seeds.yml Bungo Seeds swapped for Tobacco Seeds.

---------

Co-authored-by: Jarmer123 <148848017+Jarmer123@users.noreply.github.com>
2025-02-03 15:33:14 -08:00
keronshb
3d6188c921
DSword Replacement - the Hypereutactic Blade (#32414)
* hypereutactic textures

* adds hypereutactic blade

* adjusts attack speed and damage

* adjust attack speed and adds movement modifier

* Adds structural damage

* Readjusts the attack rate to be 0.8

* Adds Hypereutactic blade to the upliink

* Adds use delay and structural damage, fixes disappearing wielded sprite

* Changes wideAngleAnimation to 180 and range to 2.5

* Adds copyright. Changes range to 2.0

* Required wield

* Changes reflect chance to 100%

* Comments for future todos

* Description update

* Removes duplicate mapping

* removes from uplink

* Reorder and remove indents
2025-02-03 22:22:21 +01:00
DieselMohawk
8b56f6f1e9
Security Shield Naming Structure Inconsistency Change (#34841) 2025-02-02 20:04:04 -05:00
UpAndLeaves
20f5cbf3fd
Fixed Wehxplosion yaml error (#34837) 2025-02-02 22:31:32 +01:00
keronshb
c82f77ef07
Wizard Touch Spells (Smite, Cluwne's Curse, Slippery Slope) (#34531)
* Renames Smite Spells yml to Touch Spells and Renames Smite Spells region to the same

* Adds wizard clothes requirement to Smite. Adds Cluwne spell. Adds EnsureCompOnTouchSpellEvent and implements it in the magicsystem

* Adds Smite and Cluwne to the grimore and loc for them

* Adds Slippery Slope spell and SlipOnCollide

* Adds handled for comp spell event

* Removes super slippery

* Removes EnsureCompOnTouchSpell it was redundant with ChangeComponentsSpellEvent

* Makes requirement-free action for smite

* checks if we should be slipping what we touch

* Removes SlipOnCollide, adds negative speed for steptrigger

* Removes slip on collide adds negative speed for steptrigger
2025-02-02 20:23:41 +01:00
Utmanarn
2991f1ad40
Reworded the "SAY HEY LISTEN" silicon law (#34819)
* Changed law

Changed a must always law to have wording that does not encourage message spamming.

* Fixed a mistake

Forgot to remove the "YOU MUST ALWAYS" from the commit.

* Reworded the law

Reworded the law to be more open the other potential options.
2025-02-02 20:13:58 +01:00
Tayrtahn
eeccdbf038
Fix diona plushie bloom visuals (#34832) 2025-02-02 20:12:23 +01:00
Minty642
4aaa7baa7f
Add Reagent gold and silver solification with frost oil (#33239)
* Add Reagent gold and silver solification with frost oil

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* edit frostOil value

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

* Update Resources/Prototypes/Recipes/Reactions/fun.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-02 02:00:31 +01:00
ToxicSonicFan04
763136f09e
Armory Packed update. (#34808) 2025-02-01 14:19:28 -07:00
Spessmann
6beb8e4d35
Randomized maints rooms (#33619)
* became real

* should fix it

* added moar
2025-02-01 17:52:32 +01:00
Boaz1111
db1b0a9144
Separates frost oil into coldsauce and frost oil (#34458) 2025-02-01 09:20:01 -06:00
NazrinNya
207aa5fb38
Replacing protein with razorium in flesh kudzu (#32821)
* Update kudzu.yml

* FleshKudzu also contains a little of protein now

* oop-

* add meat tag

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-02-01 13:10:20 +01:00
Nox
9e9c9b94eb
Marathon Armory Restock (#34798)
* Initial commit

* fixed a issue

* finished
2025-01-31 23:32:41 -07:00
Nox
36225188d7
Rename shields (#34794) 2025-01-31 18:39:21 -05:00
themias
b2299bf0fa
Update shutter sounds (#34774) 2025-01-31 18:41:51 +01:00
SlamBamActionman
b07327cc2f
Tweak pill eat delays (#34764)
Initial commit
2025-01-31 12:59:38 +01:00
Nox
ef238200f5
Box Armory Restock (#34750)
* initial commit

* Initial commit

* fixed some things

* Finished changes
2025-01-31 00:23:03 -07:00
Nox
aa71ace43f
Meta Station - Armory restock + fixes (#34717)
* Initial commit

* Updated

* Finished changes

* made the minefield signs outside sec much more visible to stop your skill issue.
2025-01-31 00:22:52 -07:00
keronshb
6565ba52b2
Void's Applause (#34591)
* Adds single clap emote

* Adds missing single clap loc

* Adds void blink effects, sound, and sprite

* Adds VoidApplauseEvent and implements it into the Magic System and Grimoire

* Removes commented Spawn code in Shared Magic System. Adds comments to replace pointlight with a negative light in the future.

* Makes spells Mono

* Changes to swap positions.

* Makes Void Applause target body only

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Client/Magic/MagicSystem.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Audio/Effects/Emotes/attributions.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/SoundCollections/emotes.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Magic/Events/VoidApplauseSpellEvent.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Removes duplicate effect spawning from server

* Puts Void Applause effect on server, lets lizards hear clap

* Adds single clap to diona

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
2025-01-31 01:10:35 +01:00
K-Dynamic
1cbfc7d652
Minor shotgun changes and comments for future changes (#33512)
* kammerer ammo, firerate and comment

* bulldog description

* enforcer description and comment

* DB and sawn-off firerate parity, sawn-off comment

* description changes

* reduce kammerer firerate again
2025-01-30 09:36:12 -08:00
ScarKy0
ca297f576e
Serializable emag flags (#34766)
* serializable idk

* guh
2025-01-30 14:15:01 +01:00
Vigers Ray
8a6ea6ac33 Merge remote-tracking branch 'refs/remotes/wizards/master' 2025-01-30 15:38:24 +03:00
SpaceRox1244
cccdd8875e
Adjust inventory size of ginormous scrap (#33454)
Adjusts the size of ginormous scrap to fit in bags of holding
2025-01-30 13:06:41 +01:00
Velken
c360a97e3b
Juice that makes you go boom (#34730)
* Juice that makes you go boom

* moved explosive juice to fun yml - fixed ExplosionReactionEffect.cs not having TileBreakScale parameter - made Drazil plushie major contraband (they are evil!!!!!)

* removed JASON!!!! JASOOON!!! JASON!!!

* don't do commits at 1am

* Update fun.yml

fix ident

* no more bullying the server (only 1 explosion)
2025-01-30 12:34:32 +01:00
Vigers Ray
72ad978261 Фикс числа антагов 2025-01-30 13:40:28 +03:00
Vigers Ray
0938dd23d0 фикс имплантов у воров 2025-01-30 13:37:51 +03:00
Vigers Ray
9bf5f73ec3 Невидимая невидимость 2025-01-30 13:35:45 +03:00
Vigers Ray
ef118f2046 дробь теперь лучше видна при стрельбе 2025-01-30 13:16:22 +03:00
Vigers Ray
a93626dd9a фиксы апстрима 2025-01-30 12:22:17 +03:00