2905 Commits

Author SHA1 Message Date
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
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
Jabak
8de3924481 Merge remote-tracking branch 'upstream/master' 2024-06-28 11:45:35 +03:00
ThereDrD0
36ab40ada7 Глобальный респрайт оружия (#387)
* resprite: part 1

* total brainfucken

* fixes

* uplink icons + ammunition resprite
2024-06-27 23:54:09 +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
6dfda3629d blyat 2024-06-25 00:18:48 +03:00
Jabak
6c0bf75d21 Amirka Ghost 2024-06-25 00:12:32 +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
CaypenNow
fa348657f9 Обновление модулей (#365)
* base aim module

* sprites, prototypes

* more prototypes

* fix

* fix

* fix2
2024-06-21 13:24:13 +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
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
ThereDrD0
41c6d99b93 add: scroll resprite (#358) 2024-06-15 16:37:17 +03:00
Aviu00
e9b634c6c9 - add: Mjolnir. (#350) 2024-06-14 02:56:59 +03:00
Jabak
56784ca0dc Merge remote-tracking branch 'upstream/master' 2024-06-13 09:07:23 +03:00
Aviu00
4d09ed9245 Spellblade update (#346)
* - tweak: Don't close eui too quickly.

* - add: Spellblade update.

* - fix: Cult teleport spell.
2024-06-11 23:07:47 +03:00
Jabak
77234ff343 Кушать хочу 2024-06-09 20:49:07 +03:00
Aviu00
0c34a1fd9b Magic 3 (#340)
* - add: Some tweaks and localization.

* - add: Teleport spell.

* - tweak: Tweak wizard hardsuit.

* - add: Turn off shield on cast.

* - add: New wizard clothes & update wizard shuttle,

* - remove: Remove old clothes from shuttle.

* - fix: No teleporting to centcomm.
2024-06-09 19:26:27 +03:00
Jabak
4624ef7cf0 Пу пу пу пу 2024-06-08 23:44:25 +03:00
Jabak
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Jabak
7847041671 customGhost Krahankit 2024-06-08 22:31:34 +03:00
Jabak
de0afa5902 - delete: Моя вера в людей 2024-06-08 22:15:54 +03:00
Aviu00
e72db9d701 Stunprod fixes & add new sprites (#334)
* - tweak: Cleanup snatcherprod and tentacle gun.

* - fix: Cleanup StunprodSystem.

* - add: Snatcherprod on inhand sprites.
2024-06-06 14:30:00 +03:00
Jabak
91abaa0f6e Sosal 2024-06-05 17:19:10 +03:00
Jabak
4827bd5701 - fix: runamius CustomGhost 2024-06-05 16:48:08 +03:00
Jabak
fa0258b34e vorge CustomGhost 2024-06-04 19:58:17 +03:00
Jabak
bcf4074eca Merge remote-tracking branch 'upstream/master' 2024-06-04 14:07:10 +03:00
Jabak
cfd9b19da0 runamius CustomGhost 2024-06-03 23:40:55 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +03:00
Stasvozgalov
bfe29e97a3 UnoCards 2024-06-02 20:39:31 +03:00
Jabak
fd2b99d0b6 - add: Svaston 2024-06-01 23:54:01 +03:00
Aviu00
231927a577 Security update (#323)
* add: security hud update

* access & fix names

* translates

* fix

* - fix: Fixes.

* - fix: Условно-досрочно.

---------

Co-authored-by: CaYpeN1 <artem7771art@gmail.com>
2024-06-01 16:28:21 +03:00
ThereDrD0
5a705ac195 Revert "[Feat] Обновление для визора СБ (#274)" (#320)
This reverts commit 3a5fcf35a5.
2024-06-01 14:12:12 +03:00
CaypenNow
3a5fcf35a5 [Feat] Обновление для визора СБ (#274)
* add: security hud update

* access & fix names

* translates

* fix
2024-06-01 10:30:21 +03:00
Jabak
d35247adc5 Merge remote-tracking branch 'upstream/master' 2024-05-31 23:12:21 +03:00
Stasvozgalov
130fcfe1d2 New-marker-spawners (#319) 2024-05-30 21:56:18 +03:00
Aviu00
7f1825b713 Фиксы (#314)
* - fix: Fix surplus discount.

* - fix: Fix clumsy bolt barrage.

* - fix: Bookshelf fix error.

* - fix: Fix lying.

* - add: Monkeys can lie down.

* Revert "- fix: Fix surplus discount."

This reverts commit b89f9dc75fa7908198cfe054a7623d4effbe63d6.

* - remove: No shuttle wall reflect.
2024-05-30 15:12:24 +03:00
Jabkas
7282ac2471 Merge remote-tracking branch 'upstream/master' 2024-05-27 08:43:42 +03:00
ThereDrD0
38ef94d7fb add: fluff (#307) 2024-05-16 01:42:45 +03:00
Jabkas
9204951c3b Tagilla-hammer 2024-05-14 17:37:00 +03:00
Stasvozgalov
518a0d7cc6 Tagilla-hammer (#301)
* Tagilla-hammer

* Update tagilla_hammer.yml
2024-05-12 00:35:06 +03:00
Stasvozgalov
6c96db1945 Revert "Tagilla-hammer" (#300) 2024-05-11 23:52:06 +03:00
Stasvozgalov
21af31fc93 Tagilla-hammer (#299) 2024-05-11 23:22:52 +03:00
Stasvozgalov
a449824dff Tagilla-hammer
Молот Тагиллы для ХОС-а. Ура забивать феленидов в пол!
2024-05-11 23:17:49 +03:00
Stasvozgalov
33ea14ebb9 Игральные карты 2024-05-06 20:02:33 +03:00