Cinka/OldThink
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity
27,488 Commits 1 Branch 0 Tags
master
Commit Graph

397 Commits

Author SHA1 Message Date
Jabak
6071e9d289 Merge remote-tracking branch 'upstream/master' 2024-07-15 16:27:22 +03:00
Spatison
9b2247bcc7 Fix (#438) 
* commit

* commit

* commit
 2024-07-14 16:26:12 +03:00
Aviu00
9950864b8b Фиксы (#439) 
* - fix: Ebow.

* - fix: Cult deconversion.

* - add: Bola update.

* - fix: Error.

* - fix: Holoprojectors.

* - fix: Clumsy.
 2024-07-14 15:27:20 +03:00
Spatison
092c5b61c9 BodyCameraFix (#436) 
* BodyCameraFix

* commit
 2024-07-12 14:14:17 +03:00
Jabak
14e413b38a Merge remote-tracking branch 'upstream/master' 2024-07-07 22:09:11 +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
Jabak
8d635232d7 Merge remote-tracking branch 'upstream/master' 2024-07-05 21:22:42 +03:00
rhailrake
eced84e98e master 2024-07-05 23:14:06 +05:00
Jabak
35edf6460a Merge remote-tracking branch 'upstream/master' 2024-07-02 21:26:29 +03:00
Remuchi
55a225f574 [Fix] Потенциальный фикс ТТС (#413) 
* fix: possible tts fix??

* style: не втыкай
 2024-07-02 18:56:53 +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
d9aa2f16f5 fix: fix station announcement (#407) 2024-07-01 16:02:51 +03:00
ThereDrD0
d3413b9a40 Hot fix (#406) 
* Revert "Hot revert (#403)"

This reverts commit 65283e1c44.

* hotfix
 2024-07-01 14:36:20 +03:00
Aviu00
9e6b86c5ad Magic fix (#404) 
* - tweak: Hfrequency blade.

* - fix: Magic fixes.
 2024-07-01 14:23:51 +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
Aviu00
93943aaf95 Tweaks (#394) 
* - tweak: Rev tweaks.

* - tweak: Item drop and lying tweaks.

* - tweak: No ebow stamina damage.

* - tweak: Fun tweaks.
 2024-06-29 23:03:28 +03:00
ThereDrD0
e9232e638c Another fixes and features (#392) 
* fix: doorlights supports emagging now + fix emergency light

* add todo to PointLightAirlockSystem.cs

* tweak: reduce captain armor size

* fix: fix wt550 magazine stored rotation

* add: new lobby songs

* fix: fix lobby music rotation
 2024-06-29 09:49:43 +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
630ebae42a oioioi (#386) 2024-06-27 11:22:16 +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
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
ce87e33237 Merge remote-tracking branch 'upstream/master' 2024-06-22 15:40:08 +03:00
ThereDrD0
77696fa638 Реврайт освещения от дверей на клиент (#375) 
* fix: doors no longer light up without power

* rework: rewrite PointLightAirlockSystem on client

* public to private

* cleanup
 2024-06-22 13:53:37 +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
ThereDrD0
4419931172 Мягкий свет для всякого (#316) 
* add: add small soft light to laser weapon + fix the bluest blue energy shield

* git commit

* boltlights done

* add: HuetaSystem

* add: Doorlights finally done

* add: small light to lockers

* add: small light to multitool

* fix: fix naming

* hui pizde

* fix: fix parasha

* add: small light to powercells

* zabil

* add: code light to welders

* tweak: better energy and radius

* add: better color parameters

* add: less radius and energy for guns

* add: better lights for vending machines

* add: better light to consoles

* add: better light for apc

* shut up

* fix: thank you neuro colleague
 2024-06-21 06:15:55 +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
c88050b109 Merge remote-tracking branch 'upstream/master' 2024-06-17 00:04:36 +03:00
Aviu00
3353440a99 Реворк экспедиций (#360) 
* - add: Expedition rework.

* - tweak: Hardsuit tweak.
 2024-06-16 18:33:26 +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
Aviu00
f18cde3d6c Cult fix cloning & more (#355) 
* - fix: Fix cult cloning.

* - tweak: Some tweaks.

* - fix: Cult door not rcd deconstructible.
 2024-06-14 17:01:26 +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
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
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
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
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