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

397 Commits

Author SHA1 Message Date
Jabak
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Aviu00
c1fe31b63b More magic (#338) 
* - tweak: Magic tweaks.

* - add: Rework some spells.

* - fix: Some bugfixes.

* - tweak: Less requirements.

* - add: Loc.
 2024-06-08 16:01:49 +03:00
Aviu00
4fde7aedee Маг (#336) 
* GameRule, a lot of prototypes and FTL pending

* some protos

* - add: Magic additions, tweaks and bugfixes.

* - add: Wizard gamerule.

* - tweak: Do not call shuttle.

---------

Co-authored-by: melano <92106367+melanoTurbo@users.noreply.github.com>
 2024-06-07 16:02:23 +00: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
Aviu00
152c9546a4 - add: TelefragSystem. (#333) 2024-06-06 13:23:00 +03:00
Aviu00
ad65bd1e58 Фиксы (#332) 
* - fix: Fix desword flipping on server.

* - fix: Fix invalid cult target.

* - fix: Fix narsie summon.

* - tweak: Weaker heavy attack.

* - tweak: Less toy desword stamina damage.

* - fix: FrameUpdate.

* - tweak: Less blunt bleed.
 2024-06-06 13:22:49 +03:00
Aviu00
17b92f27a9 - fix: Fix sechud. (#328) 2024-06-05 10:21:05 +03:00
Jabak
bcf4074eca Merge remote-tracking branch 'upstream/master' 2024-06-04 14:07:10 +03:00
Aviu00
9d1c014938 Вернуть трейлы от пуль (#270) 
* - add: Bring back bullet trails.

* - add: Cvar, thinner trails.

* - add: Add option.
 2024-06-04 14:00:48 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +03:00
Aviu00
ad72eea8a1 - add: Cleanup TelescopeSystem. (#325) 2024-06-02 20:50:04 +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
RinKeeper
357680d278 fixes (#282) 
* fix: fixes

* resolve conflicts

* very important commit

* very important gramatical error

* incredible architecture solution
 2024-05-30 17:48:15 +03:00
Remuchi
d4be4d3445 [Feat] Внешний вид и название канистр можно изменить прямо в игре (#317) 
* feat: Теперь можно менять внешний вид канистр газов

* fix: русский язык (я его не знаю)
 2024-05-30 17:28:53 +03:00
Aviu00
e509855524 - add: Revive 2.0. (#318) 2024-05-30 15:27:13 +03:00
Jabkas
306a561f12 delete: MeatyOre AutoBan + MeatyOre Antag Button 2024-05-21 23:02:17 +03:00
Aviu00
2ccbaf09a4 Merge remote-tracking branch 'upstream/master' into ups 2024-05-03 14:26:57 +03:00
Aviu00
9a72a48c4b Fixes mostly (#292) 
* - fix: Fix animals standing.

* - fix: Stuff drop from hands on stun or death even if lying.

* - tweak: Tentacle gun no longer stuns.

* - fix: Space cleaner now evaporates.

* - remove: No crew monitor objective.

* - fix: Fix time beacon.

* - tweak: Revert neuro implant buff.

* - tweak: Nerf dagger.

* - fix: Fix void adaptation not working.
 2024-04-23 16:20:16 +03:00
Remuchi
9565de0262 [Feat&Fix] Система лежания (#288) 
* лежать

* лучше так сделать

* - remove: Gravity is fine.

* - add: Hit moving lying targets.

* - tweak: Lie down insted of stun on FTL.

* - fix: Fix double component.

* - remove: Disable recoil.

---------

Co-authored-by: Aviu00 <aviu00@protonmail.com>
 2024-04-22 18:14:23 +03:00
Aviu00
6272da2bb3 Fixes (#289) 
* - fix: Ling fixes.

* - fix: Fix ghasp identity.

* - fix: Low temp slowdown fix.

* - fix: Crossbow fix.

* - fix: Fix gamerules.

* - fix: Fix shadow shackles.

* - fix: Cleanup refund.

* - fix: Can't pry runic door.

* - fix: Fix crash.

* - fix: Fix mood.

* - fix: Fix dictionary.
 2024-04-21 18:07:27 +03:00
Remuchi
28b714a318 fix: теперь в лобби можно прослушать голос 2024-04-20 12:38:13 +07:00
Remuchi
6efdbba72b fix: способность фантома не убирает его полёт по окончанию 2024-04-17 13:46:55 +07:00
Remuchi
787ce1e674 немного снизим количество warning при билде 2024-04-17 11:52:49 +07:00
Remuchi
44b9c3d723 fix: ТТС снова выдает правильные голоса 2024-04-17 11:50:47 +07:00
Remuchi
57e50ceed5 shitcode is real 2024-04-13 14:15:41 +07:00
Remuchi
e2b6002076 Merge remote-tracking branch 'origin/master' into upstream 
# Conflicts:
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/Changeling/ChangelingRuleSystem.cs
#	Content.Server/Changeling/ChangelingSystem.Abilities.cs
#	Content.Server/Doors/Systems/DoorSystem.cs
#	Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs
#	Content.Server/GameTicking/Rules/RevolutionaryRuleSystem.cs
#	Content.Server/GameTicking/Rules/TraitorRuleSystem.cs
#	Content.Server/GameTicking/Rules/ZombieRuleSystem.cs
#	Content.Server/Holosign/HolosignSystem.cs
#	Content.Server/Revenant/EntitySystems/RevenantSystem.Abilities.cs
#	Content.Server/_White/Cult/GameRule/CultRuleComponent.cs
#	Content.Server/_White/Cult/GameRule/CultRuleSystem.cs
#	Content.Server/_White/Cult/Runes/Systems/CultSystem.Rune.cs
#	Content.Server/_White/Keyhole/KeyholeSystem.cs
#	Content.Server/_White/MeatyOre/MeatyOreStoreSystem.cs
#	Content.Shared/Projectiles/SharedProjectileSystem.cs
#	Content.Shared/Weapons/Melee/SharedMeleeWeaponSystem.cs
#	Content.Shared/_White/Keyhole/Components/KeyBaseComponent.cs
#	Resources/Locale/ru-RU/White/stuff.ftl/runes-entities.ftl
#	Resources/Locale/ru-RU/_white/cult/blood-spear.ftl
#	Resources/Locale/ru-RU/_white/cult/bolt-barrage.ftl
#	Resources/Locale/ru-RU/_white/cult/cult.ftl
#	Resources/Locale/ru-RU/_white/cult/gui.ftl
#	Resources/Locale/ru-RU/cult/cult-structure.ftl
#	Resources/Locale/ru-RU/cult/pylon.ftl
#	Resources/Maps/White/Scoupidia.yml
#	Resources/Maps/White/Void.yml
#	Resources/Maps/White/WonderBox.yml
#	Resources/Prototypes/Actions/types.yml
#	Resources/Prototypes/Atmospherics/gases.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_atmospherics.yml
#	Resources/Prototypes/Catalog/Cargo/cargo_vending.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/dressers.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/heads.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/misc.yml
#	Resources/Prototypes/Catalog/uplink_catalog.yml
#	Resources/Prototypes/Entities/Clothing/OuterClothing/armor.yml
#	Resources/Prototypes/Entities/Objects/Misc/subdermal_implants.yml
#	Resources/Prototypes/Entities/Objects/Tools/jaws_of_life.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sledgehammer.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/sword.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Airlocks/base_structureairlocks.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/firelock.yml
#	Resources/Prototypes/Entities/Structures/Doors/Firelocks/frame.yml
#	Resources/Prototypes/Entities/Structures/Doors/SecretDoor/secret_door.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/assembly.yml
#	Resources/Prototypes/Entities/Structures/Doors/Windoors/base_structurewindoors.yml
#	Resources/Prototypes/Entities/Structures/Furniture/dresser.yml
#	Resources/Prototypes/Entities/Structures/Lighting/base_lighting.yml
#	Resources/Prototypes/Entities/Structures/Power/cable_terminal.yml
#	Resources/Prototypes/Entities/Structures/Walls/grille.yml
#	Resources/Prototypes/Entities/Structures/Walls/walls.yml
#	Resources/Prototypes/Entities/Structures/stairs.yml
#	Resources/Prototypes/_White/Entities/Objects/Misc/books.yml
 2024-04-13 13:59:00 +07:00
CaypenNow
f83adf16f4 fix (#280) 2024-04-12 17:08:27 +03:00
Aviu00
7632c7c99d - add: Update blood dagger. (#281) 2024-04-12 17:08:17 +03:00
Remuchi
a61ace4a9a фиксы под тесты ура 2024-04-10 09:57:42 +07:00
Aviu00
d2ea0bf4ed Merge remote-tracking branch 'upstream/master' into ups 2024-04-08 12:54:38 +03:00
Aviu00
d3086184bd - fix: Fix offering rune part 2. (#275) 2024-04-07 21:22:48 +03:00
Aviu00
3d15c80a23 - tweak: No meaty ores during nukie war. (#276) 2024-04-07 21:22:39 +03:00
Aviu00
d8570b8bda - add: TelescopeSystem. (#273) 2024-04-06 15:31:51 +03:00
Remuchi
9fce261ed8 ну чето вроде пофиксилось 2024-04-06 11:53:05 +07:00
CaypenNow
4938553945 [Feat] Modules Update (#268) 
* add new module slot

* update priority

* sprites + changes in system

* sprites on SMGs + fix examine

* sprite fix
 2024-04-04 16:44:55 +03:00
Aviu00
4ad5531d62 Нерф священника (#264) 
* - remove: Nuke HolyComponent.

* - tweak: SuitStorage for weapons.

* - tweak: More slots for weapons.

* - tweak: Cult magic tweaks.

* - fix: Fix desc.
 2024-04-03 20:04:08 +03:00
Aviu00
9f00a90f24 Aspects (#266) 
* - add: Revive fast and furious aspect.

* - add: Update accents.

* - add: More buzzing for moth.

* - tweak: Change desc.

* - fix: Fixes.

* - add: RandomItemAspect.

* - fix: Fix arachnid socks.

* - tweak: Update desc part 2.
 2024-04-02 17:19:33 +03:00
CaypenNow
fa00c5f528 [Fixes] Всякое (#265) 
* syndicate teleporter fixes

* trigger fix
 2024-04-02 17:19:23 +03:00
Aviu00
b5cede485d - tweak: Nerf blight. (#263) 
* - tweak: Nerf blight.

* - tweak: ... But bible no longer works.
 2024-04-02 17:18:05 +03:00
CaypenNow
b635d4efaf [Feat] Interactive Board (#258) 
* interactive board

* change2

* fixes
 2024-04-02 17:17:43 +03:00
Aviu00
67e7657f3c - fix: Fix offering rune not working. (#262) 2024-04-01 18:22:13 +03:00
Aviu00
2e57cbf514 Ling fixes and tweaks (#259) 
* - fix: Bees fix.

* - fix: Transform transfers body type.

* - fix: Chemcap is transfered on transform.

* - fix: Gulag objective actual fix.

* - fix: Fix escape with identity not working.

* - tweak: Fixes & objective tweaks.

* - tweak: More slowdown from ling armor.
 2024-04-01 14:36:32 +03:00
CaypenNow
35a354b55a [Feature] Экспериментальный телепортер синдиката (#250) 
* add: experimental syndicate teleporter

* randomvector method

* fix

* check mob attempt 1

* revert

* add check for pull

* new charge system

* changes

* changes

* small fix
 2024-04-01 11:51:50 +03:00
RinKeeper
e6790ef190 fixes (#248) 
* tweak: hotbar translation

* oops

* tweak: WhiteBox update

* tweak: Bagel, Meta and Train in map pool

* tweak: ERTsystem changes and new ERT map

* cvar fix

* nerf: radium no longer has a touch effect

* tweak: chem touch tweaks

* tweak: patch applies reagents over time

* patchComp fix and some tweaks

* some changes
 2024-03-31 13:12:07 +07:00
Aviu00
034a18b1d0 - add: Time beacon. (#254) 2024-03-30 15:02:02 +03:00
Remuchi
297cfd23ad пара фиксов 2024-03-30 11:33:13 +07:00
CaypenNow
6f477f32ae Модули для оружия (#222) 2024-03-30 01:33:08 +05:00