2625 Commits

Author SHA1 Message Date
Spatison
092c5b61c9 BodyCameraFix (#436)
* BodyCameraFix

* commit
2024-07-12 14:14:17 +03:00
Jabak
81eff24084 Разрешаю дать мне денег 2024-07-11 14:39:34 +03:00
Jabak
e4e01ad07c Merge remote-tracking branch 'upstream/master' into ups 2024-07-10 20:22:10 +03:00
Spatison
8deece0091 Фикс лежания (#430)
* Fix

* commit

* clear

* commit

* / WD EDIT
2024-07-10 16:26:50 +03:00
Jabak
0f30f75f14 Всплывающее окно для цели анализатора здоровья 2024-07-08 21:25:50 +03:00
Jabak
63da5d4064 всплывающее окно для исцеления цели 2024-07-08 21:24:40 +03:00
Jabak
14e413b38a Merge remote-tracking branch 'upstream/master' 2024-07-07 22:09:11 +03:00
ThereDrD0
72a2d75590 Откат переводов (#428)
* Revert "fix: fix translation bugs (#425)"

This reverts commit 9d74370e

* Revert "МЕГАпереводы (#418)"

This reverts commit 8fb2cc946d.

* add: add translation for accents
2024-07-07 12:35:08 +03:00
ThereDrD0
d9b8325fa7 Фиксы и фичи еще раз (#426)
* fix: constructs are cultists now

* rename: announcementPrototype -> arrivalNotificationPrototype

* fix: fix naming

* fix: hop became head

* resprite: cult bola looks like cult stuff now

* add: repsrite files

* translation: translation for cult bola

* tweak: now bola fits in belt

* refactor: refactor KnockDownOnCollideSystem

* tweak: bolas knockdown on hit

* add: energy bola

* cleanup: less components
2024-07-06 09:34:29 +03:00
ThereDrD0
9d74370e7a fix: fix translation bugs (#425) 2024-07-06 06:57:58 +03:00
Jabak
8d635232d7 Merge remote-tracking branch 'upstream/master' 2024-07-05 21:22:42 +03:00
ThereDrD0
8fb2cc946d МЕГАпереводы (#418)
* add: 1000 translation files

* add: translations p2

* translations p3

* translations p4

* finally done

* fixes

* fixes 2

* fixes 3
2024-07-05 18:01:37 +03:00
Jabak
03ee041be9 Gender Swap 2024-07-03 11:17:58 +03:00
ThereDrD0
bc57436166 Новые растения в ботанику (#416)
* add haloperidol, potassium iodide

* review fixes

* review and tuning

* add: translation

* new mutations

* translation string fix

* holymelons are holy now

* add: translation

* rename holymelon

* Tomato killers don't kill the server anymore. (#28173)

* tomato killer auto death

* fix

* Update miscellaneous.yml

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-07-03 01:03:39 +03:00
ThereDrD0
d8ffea1ee8 Апстрим некоторого из ботаники (#415)
* Rainbow Weed (#25759)

* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents

* Psicodine, Mannitol, Lipolicide and Happiness (#27134)

* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* fix cannabis

* Killer tomatoes (#26053)

* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

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

* Small tomato killer tweak (#27265)

* Update miscellaneous.yml

* Update mobspawn.yml

* Update miscellaneous.yml

* Update miscellaneous.yml

* Spaceman's Trumpet and Lily (#25090)

* trumpet + lily +polypy

* trumbet

* Change plant clipping mechanics (#25326)

Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.

* fixes

* Resprite & hand position correction of Nettle & Death Nettle (#25421)

Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.

* Remake hairflowers (#25475)

* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

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

* Revert "Remake hairflowers (#25475)"

This reverts commit 6b2a9b96b18a6c854c3aea149611d7dd496518c0.

* Make Holy Water more like Water (#27068)

holy water can now be used to satiate thirst, water plants, and extinguish fires.

* New plant mutation: Pyrotton (#27200)

* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent

* Rewords plant/effect descriptions for clarity (#28156) (#28169)

* Rewords plant/effect descriptions for clarity (#28156)

* Forgot Robust Harvest.

* Update Resources/Locale/en-US/guidebook/chemistry/effects.ftl

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

---------

Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Flesh <62557990+PolterTzi@users.noreply.github.com>
Co-authored-by: MjrLandWhale <brandonemitch@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: alex-georgeff <54858069+taurie@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2024-07-02 23:23:12 +03:00
Jabak
35edf6460a Merge remote-tracking branch 'upstream/master' 2024-07-02 21:26:29 +03:00
ThereDrD0
a0d346096d ГНОМЫ (#411)
* This adds the basic wirework for the gnomes, very unfinished

* GNOMES ARE DONE EXCEPT FOR GLUE WOOO

* removes gnome id, fixes ai and punch sounds, comments out the code for glue to take fuel

* changed sounds to non meme versions

* HAT NOW GIVES THE GNOME ACCENT TOO

* fixes a typo with Unclippable being Unclipable

* removed cuffable component (iforgotaboutit)

* added unrevivable to gnomes so defibs wont try (it was immpossible anyways but this is better)

* removes scrap code i put in the repair system

* remove the carrot mutation code i made (its bad)
clean up some things in the repairable system

* changes accent system from rplacging g to replacing no

* Fix the conflict (plz work)

* adds another comment bleh bleh im trying to fix things

* PAIN.jpeg

* work plz?

* FIX FOR REAL

* camel case mayhaps?

* adds unfinished glue use code (you can still see lit or not lit when held >:/   )

* temporary fix

* add: GNOMES REVAMPED

* fix: fix accent, sounds and add spawners

* add: gnome seeds to seed vendor

---------

Co-authored-by: BITTERLYNX <gagestemmerman@gmail.com>
2024-07-02 12:55:25 +03:00
ThereDrD0
d3413b9a40 Hot fix (#406)
* Revert "Hot revert (#403)"

This reverts commit 65283e1c44.

* hotfix
2024-07-01 14:36:20 +03:00
ThereDrD0
65283e1c44 Hot revert (#403)
* Revert "add: notification upon head arrival (#402)"

This reverts commit a87b5295bc.

* Revert "Constr. graph 2 recipes fix (#401)"

This reverts commit 5832144695.
2024-07-01 14:19:29 +03:00
ThereDrD0
a87b5295bc add: notification upon head arrival (#402) 2024-07-01 13:10:32 +03:00
Jabak
8b2fbf6168 Merge remote-tracking branch 'upstream/master' 2024-07-01 00:53:56 +03:00
ThereDrD0
164251ffa7 Cherrypicks 5 (#399)
* Give moldy food the "Trash" tag (#29380)

Make moldy food items have the "Trash" tag, so they can be collected.

* Add "Structure" tag to switches, buttons, and levers (#29378)
shit
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>

* Revamped Meteor Swarm (#28974)

* meteor code and balanced values

* Meteor Swarms

* Update meteors.yml

* Update meteors.yml

* HOO! (fix overkill bug and buff space dust)

* undo BloodstreamComponent.cs changes

* DamageDistribution -> DamageTypes

* part 2.

* meteor fixes

* improve meteor spawning (#29057)

* Decrease meteor frequency (#29194)

* Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)

* Revert "Make Projectiles Only Hit a Variety of Station Objects Unless Clicked on (#28571)"

This reverts commit 4f934f02f17ce55cabc03b965eb1df7738d63148.

* Makes machine parts stackable, removes unused field in stack prototypes (#28434)

* Makes machine parts stacks, removes unused field in stack prototypes

* forgor

* Fix tests

* Fixes lathe construction. Yes. This sucks but there's no better way that doesnt involve refactoring machine parts completely

* detail

* a

* Add pressure and temperature warning text to firelocks (#28341)

* fix firelocks

* missing nukies can be filled in by ghost roles (#28316)

* Revert "missing nukies can be filled in by ghost roles (#28316)"

This reverts commit 99f13e1e45bc778a4941316fde5d89d7b91337ce.

* welding gas mask (#27108)

* welding gas mask

* eek

* Canes + Cane Blade for Syndicate Librarians (#25873)

* Cane + Cane Blade

* Add - type: ContainerContainer

* Add another - type: ContainerContainer

* Fix and add proper ContainerContainer component

* Add UserInterface component

* Remove Space

* Stat Changes

* review

---------

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

* Fix stupid NPC. (#26868)

* init commit

* Review

---------

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

* fixes

---------

Co-authored-by: VeritableCalamity <34698192+Veritable-Calamity@users.noreply.github.com>
Co-authored-by: eoineoineoin <github@eoinrul.es>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
Co-authored-by: ShadowCommander <10494922+ShadowCommander@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Ps3Moira <113228053+ps3moira@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Vigers Ray <60344369+VigersRay@users.noreply.github.com>
2024-06-30 10:04:27 +03:00
Aviu00
8922181b84 Cherrypicks 4 (#393)
* Immovable Rod changes (#26757)

* Adds non randomized rod velocity (#27123)

* adds non randomized rod velocity

* Adds despawn suffix to despawn rod

* make fire spreading scale with mass (#27202)

* make fire spreading scale with mass

* realer

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* lower max firestacks to 10, refactor flammable (#27159)

* lower max firestacks to 10, refactor flammable

* fix

* uncap fire stack damage, lower fire stack damage

* fix fire spread round removal (#27986)

* fix a resolve debug assert

* rewrite fire spread

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* fire troll fix (#28034)

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Hide doafters if you're in a container (#29487)

* Hide doafters if you're in a container

* Out of the loop

---------

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

* Add ghost role raffles (#26629)

* Add ghost role raffles

* GRR: Fix dialogue sizing, fix merge

* GRR: Add raffle deciders (winner picker)

* GRR: Make settings prototype based with option to override

* GRR: Use Raffles folder and namespace

* GRR: DataFieldify and TimeSpanify

* GRR: Don't actually DataFieldify HashSet<ICommonSession>s

* GRR: add GetGhostRoleCount() + docs

* update engine on branch

* Ghost role raffles: docs, fix window size, cleanup, etc

* GRR: Admin UI

* GRR: Admin UI: Display initial/max/ext of selected raffle settings proto

* GRR: Make a ton of roles raffled

* Make ERT use short raffle timer (#27830)

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

* gives loneops a proper ghost role raffle (#27841)

* shorten short raffle (#28685)

* - fix: Conflicts.

* - fix.

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: no <165581243+pissdemon@users.noreply.github.com>
Co-authored-by: Boaz1111 <149967078+Boaz1111@users.noreply.github.com>
Co-authored-by: HS <81934438+HolySSSS@users.noreply.github.com>
2024-06-29 23:02:26 +03:00
Jabak
f7d338834a Merge remote-tracking branch 'upstream/master' 2024-06-29 00:41:48 +03:00
Remuchi
ca62beb91f fix: фикс краша серверов через настольные игры (#389) 2024-06-28 12:19:47 +03:00
Jabak
8de3924481 Merge remote-tracking branch 'upstream/master' 2024-06-28 11:45:35 +03:00
ThereDrD0
7048913336 Рандомные фиксы и пересмотр хранилищ с предметами (#381)
* add: fixed wrong item rotation in inventory

* fix: forcepreset no longer starts round

* fix: fix localisation

* add: forcepreset command logging

* add: Storage and items rework, part 1

* rework: item size rework part 2

* add: blood loss accent rework

* no spaces
2024-06-27 11:37:42 +03:00
RinKeeper
2cdf178447 wizard admin verb (#374)
* done

* oops

* some wizard rule tweaks

* Update WizardRuleSystem.cs

resolve
2024-06-27 08:59:13 +03:00
Aviu00
649ded64d6 Разное (#385)
* - add: Meatspike changes.

* - fix: Fix socks.

* - remove: No light status.

* - tweak: Raptor tweak.

* - fix: Fix exception.

* - remove: Remove unsexed.

* - tweak: Crossbow tweak.

* - add: More meatspike.

* - tweak: Nerf buff rune.

* - tweak: No throwing during incorporeal.

* - add: Incorporeal magic cooldown.
2024-06-26 14:56:29 +03:00
Jabak
266ab94335 Merge remote-tracking branch 'upstream/master' into ups 2024-06-26 13:09:06 +03:00
ThereDrD0
e35098f7dd Красивое УИ телепорта для призрака (#378)
* add: nice ghost teleport ui

* fix: fix unused import

* wtf

* fuck you, search bar

* fix-add: finally
2024-06-26 05:13:42 +03:00
Aviu00
2fefca5f70 Cherrypicks 3 (#382)
* Mobs burn to ashes on excessive heat damage (#26971)

* mobs burn to ashes on excessive heat damage

* remove comment, remove random lines I didn't mean to add

* combine code into behavior

* clean unused

* fix namespace

* drop next to

* fix spawn entities behavior spawning entities outside container

* fix burning to ash not working on all mobs (#27158)

* add ghostnado button to warp menu (#27556)

* add ghostnado button to warp menu

* translator ops

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>

* Make arguments and parameters wrap to one variable per line (#27766)

* Fix ghosts getting spawned in nullspace (#27617)

* Add tests for ghost spawn position

* Make ghosts spawn immediately

* Format mind system

* Move ghost spawning to GhostSystem

* Spawn ghost on grid or map

This fixes the ghosts being attached the parent entity instead of the grid.

* Move logging out of the ghost system

* Make round start observer spawn using GhostSystem

* Move GameTicker ghost spawning to GhostSystem

Moved the more robust character name selection code over.
Moved the TimeOfDeath code over.
Added canReturn logic.

* Add overrides and default for ghost spawn coordinates

* Add warning log to ghost spawn fail

* Clean up test

* Dont spawn ghost on map delete

* Minor changes to the role test

* Fix role test failing to spawn ghost

It was failing the map check due to using Nullspace

* Fix ghost tests when running in parallel

Not sure what happened, but it seems to be because they were running simultaneously and overwriting values.

* Clean up ghost tests

* Test that map deletion does not spawn ghosts

* Spawn ghost on the next available map

* Disallow spawning on deleted maps

* Fix map deletion ghost test

* Cleanup

---------

Co-authored-by: Whisper <121047731+QuietlyWhisper@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: ShadowCommander <shadowjjt@gmail.com>
2024-06-26 00:39:44 +03:00
Jabak
24876d9afa шырнулся и умер 2024-06-24 01:00:44 +03:00
Jabak
37fe791fd7 Merge remote-tracking branch 'upstream/master' 2024-06-24 00:05:53 +03:00
Aviu00
dccd8aab1a Magic 8 (#376)
* - add: Flash protection for wiz hardsuit helmet.

* - tweak: Cheaper wiz melee weapons.

* - add: Rework alt lightning.

* - fix: Timestop fixes.

* - add: Don't end round on midround wizard death.

* - tweak: Better shield.

* - fix: Some fixes.

* - fix: Fix wizard teleport pulling.

* - add: Improve arc.

* - add: Update knock.

* - add: Update knock desc.

* - add: Arcane Barrage.
2024-06-22 15:55:50 +03:00
Jabak
5ac7ca6faa Merge remote-tracking branch 'upstream/master' into ups 2024-06-21 21:53:12 +03:00
ThereDrD0
cb37ba5714 QoL для ХоПа (#369)
* add: nice job icons ui for HoP console

* Ebanniy rot

* add: Changing id visuals with HoP console

* cleanup

* add: remove drop down list and replace it with icon-buttons

* add: colored and sorted by department buttons

* add: columns

* tweak: nicer colors

* cleanup
2024-06-20 22:29:26 +03:00
Aviu00
3bfc442f7b Cherrypicks 2 (#371)
* Handheld teleporter portals now must start on the same grid. (#28423)

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>

* hand teleport portals now may start in the same grid. (#28556)

* Implement vital chef's hat functionality (#25950)

* Implement crucial chef's hat functionality

* Unified stopping code and added events.

* Added documentation to events

* Rerun tests

* Made review changes, and fixed potential desync bug.

* Update whitelist

* Make Hamlet a valid chef's hat pilot (#29191)

* Dropping Corpses Devoured by Space Dragons on Gib/Butcher. (#28709)

* Update DevourSystem.cs

* Update DevourSystem.cs

* Update Content.Server/Devour/DevourSystem.cs

---------

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

* Treatment of blood loss in the Rat King (#26887)

Bloodloss-RatKing

* - fix: Fix error.

---------

Co-authored-by: Moony <moony@hellomouse.net>
Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
Co-authored-by: icekot8 <93311212+icekot8@users.noreply.github.com>
Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: IlyaElDunaev <154531074+IlyaElDunaev@users.noreply.github.com>
2024-06-20 19:24:36 +03:00
Aviu00
6a7ad10d72 Timestop spell (#370)
* - tweak: Tweak mindswap.

* - fix: Mindswap and cult fixes.

* - add: Timestop v1.

* - add: Timestop spell.

* - remove: What?

* - fix: Fixes.
2024-06-20 19:24:10 +03:00
Jabak
94cae056d7 Merge remote-tracking branch 'upstream/master' 2024-06-19 12:59:49 +03:00
ThereDrD0
dff41dd6d0 Фиксы и фичи (#364)
* fix: fix localisation in lathe ui

* add: possible way to give admins access to fuckrules

* add: handcuffs pick up and drop sounds

* fix: fix missing drink glass sounds

* fix: fix missing sound

* add: all weapons now have unique pick up and drop sounds

* add: recall spell sounds

* add: cups are breakable now

* fix: fix rifles wrong collection
2024-06-19 05:47:35 +03:00
Jabak
1db0a1d60d Merge remote-tracking branch 'upstream/master' 2024-06-18 22:37:29 +03:00
Aviu00
f25ad286b9 Magic and gamerule tweaks (#363)
* - tweak: Wiz hardsuit tweaks.

* - tweak: Gamemode tweaks.

* - add: Mindswap spell.

* - add: Transfer wizard component on mindswap.

* - add: Wizard is blight immune.
2024-06-18 17:55:21 +03:00
Jabak
da298741e4 Merge remote-tracking branch 'upstream/master' 2024-06-15 19:29:46 +03:00
Aviu00
e90ffe3973 Spell descriptions (#352)
* - add: Spell descriptions and more.

* - add: Update wizard shuttle.

* - add: Add wizard to secret.

* - add: Call shuttle on wizard death.
2024-06-15 03:47:49 +03:00
Jabak
56784ca0dc Merge remote-tracking branch 'upstream/master' 2024-06-13 09:07:23 +03:00
RedBurningPhoenix
f0af49af0c posters (#349)
* posters

* another translate

* pizdec dohuya

* petcarrier
2024-06-12 23:28:18 +03:00
Aviu00
af99df5ae0 Cult stuff (#348)
* - add: Cult buff protects against spacing.

* - add: Predict RunicDoor.

* - add: Loc.

* - fix: Missing includes.

* - add: Revive rune popups.

* - tweak: Buff rune.

* - fix: Buff rune.
2024-06-12 19:00:45 +03:00
Aviu00
d75fcd40ea Ling tweak 2 (#347)
* - tweak: NOT THE BEES.

* - tweak: More chems.

* - fix: Ling abilities & alert.

* - fix: Locale.
2024-06-12 13:56:44 +03:00
Aviu00
01511adbb2 Magic 4 (#345)
* - fix: Fix teleport scroll.

* - add: Spell book.

* - add: Smite scroll & update shuttle.

* - tweak: Tweak cost.
2024-06-10 13:57:32 +03:00