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

27488 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PointPNG
54dddc736f maps update (#557) 
* maps update

* Update DryDock.yml
 2024-08-04 13:42:30 +03:00
PointPNG
6a72ce65ce Maps update (#558) 
* Maps update

* Update terminal.yml

* Update DryDock.yml
 2024-08-04 13:42:22 +03:00
RavmorganButOnCocaine
b4f424395f Automatic changelog update 2024-08-04 08:52:43 +00:00
ThereDrD0
a42e368ed8 security jumpskirt resprite (#555) 2024-08-04 11:51:40 +03:00
RavmorganButOnCocaine
c1a198ca3b Automatic changelog update 2024-08-04 08:44:08 +00:00
ThereDrD0
0ce44fbe64 lobby update (#554) 2024-08-04 11:43:00 +03:00
RavmorganButOnCocaine
1fbb613f8a Automatic changelog update 2024-08-04 06:37:15 +00:00
Remuchi
467eb84d43 [WIP] [Tweak] Ограничение раздатчиков реагентов и прочих жидкостей. (#498) 
* Reapply "Add limited-reagent dispensers (#23907)"

This reverts commit 531becd592.

# Conflicts:
#	Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs
#	Content.Server/Chemistry/EntitySystems/ReagentDispenserSystem.cs
#	Content.Shared/Chemistry/SharedReagentDispenser.cs
#	Content.Shared/Containers/ItemSlot/ItemSlotsComponent.cs
#	Resources/Prototypes/Catalog/ReagentDispensers/beverage.yml
#	Resources/Prototypes/Entities/Objects/Specific/chemical-containers.yml
#	Resources/Prototypes/Entities/Structures/Dispensers/chem.yml

* Reapply "Fix comp.Owner (#24206)"

This reverts commit 2d2405ff93.

* Reapply "Use old reagent dispenser beaker slot ID (#24209)"

This reverts commit 388424e2f3.

* Add a container display to dispenser UI (#25391)

* Implemented contents display for dispenser UI

* Update Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

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

* Resolve the netent into a euid first

---------

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

* Add prediction to hand labeler labels (#25869)

Added prediction to labels

* scoopable ash and foam, solution transfer prediction (#25832)

* move SolutionTransfer to shared and predict as much as possible

* fully move OpenableSystem to shared now that SolutionTransfer is

* fix imports for everything

* doc for solution transfer system

* trolling

* add scoopable system

* make ash and foam scoopable

* untroll

* untroll real

* make clickable it work

* troll

* the scooping room

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
# Conflicts:
#	Resources/Prototypes/Entities/Effects/chemistry_effects.yml

* Reagent dispenser UI (#27831)

* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`
# Conflicts:
#	Content.Client/Chemistry/UI/ReagentDispenserWindow.xaml.cs

* Reagent dispenser UI (Again) (#27958)

* reagent dispenser: fancy window

* reagent dispenser: dispense button grid

* reagent dispenser: rearrange containers & info

* reagent dispenser: remove `reagent-dispenser-window-container-label`

* reagent dispenser: add `Scrollcontainer` on right side

* reagent dispenser: get rid of pointless actions

* reagent dispenser: cleanup actions and `inventory` field on bound ui state

* reagent dispenser: cool reagent cards & finishing touches

* reagent dispenser: final cleanup and formatting

* reagent dispenser: `ButtonGrid` and `ReagentDispenserSetDispenseAmountMessage` refactor

* reagent dispenser: cleanup code & address minor concerns

* reagent dispenser: text in reagent cards no longer clips

* reagent dispenser: oh wait i forgot to change this and thats why the builds keep failing probably

* reagent dispenser mayybe this

* reagent dispenser: remove `using FastAccessors;`

* delete unused classes

* disable reagent button when container is empty

* Make things a bit bigger

* remove obsolete text color override

* пару фиксов поверх

* переводики хихиххи

* еще переводы

* feat: химические картриджи

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Brandon Li <48413902+aspiringLich@users.noreply.github.com>
 2024-08-04 09:36:11 +03:00
Jabak
749643cd72 Merge pull request #106 from frosty-dev/ups 
Ups
 2024-08-03 22:37:57 +03:00
Jabak
1adca3107a Merge remote-tracking branch 'upstream/master' into ups 2024-08-03 22:32:36 +03:00
RavmorganButOnCocaine
76b15fd787 Automatic changelog update 2024-08-03 18:32:27 +00:00
ThereDrD0
231eab88a8 fix duplicate module check (#551) 2024-08-03 21:31:23 +03:00
RavmorganButOnCocaine
1ad4555987 Automatic changelog update 2024-08-03 15:54:57 +00:00
ThereDrD0
48d6d8bab8 Апстрим изменений боргов (#549) 
* New borg sounds (#27205)

* New borg sounds

* Add manic laughter of an assault borg

Never wanted, but needed

* Fix wrong attribution

* Some requested changes

* Change borgwalk sounds

* Forgor

* Make borgs shown in logprobe (#27788)

* Players can no longer see that emagged cyborgs' internals have been tampered with. (#27816)

* Add emag-detection funtionality to diag huds

* Add component to the omniHUD

* Fix namespace

* Adress discord review, just axe the message.

* Medical borg add chem glasses (#27843)

* Update borg_chassis.yml

* Update borg_chassis.yml

* fix

* Removing unnecessary components and adapting changes (#28391) for the syndicate

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>

* Create Consistency in the Syndicate Borgs (#27875)

* Gives Mediborg the Medical Hud (#28391)

* Shifts borgs hats to the right a bit (#28600)

* Gives Insulation and NoSlip to all bots (#28621)

* Gives Insulation and NoSlip to all bots

* remove NoSlip from children

* Prevent borgs from getting duplicate modules (#28943)

* Prevent borgs from getting duplicate modules

* outta the loop

---------

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

* fix borgs getting deleted by salvage magnets (#29006)

* Borgs can no longer be freely locked/unlocked when emagged (#29605)

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

* Added Health Analyzer to basic treatment module. (#29696)

Removed dropped, added Health Analyzer to Basic Treatment Module

Co-authored-by: JIP <jipdawg93@gmail.com>

* Add petting cyborgs (#30037)

added petting borgs, adjusted interactions

* Fix: Syndie borg can now wield DEsword (#30229)

* Syndie borg can now wield DEsword

* Made child of EnergySwordDouble for borgs
* Made ESword borg module use this new borg DESword

* Removed name property of CyborgDESword so that it now inherits from DESword and added a suffix to differentiate the two in spawn menu

* Revert "fix borgs getting deleted by salvage magnets (#29006)"

This reverts commit c6a2d3dc0d15b1f5535ad9fe2a481ec9cfd4f111.

* borgs sound change

---------

Co-authored-by: MilenVolf <63782763+MilenVolf@users.noreply.github.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: Jajsha <101492056+Zap527@users.noreply.github.com>
Co-authored-by: marbow <152051971+marboww@users.noreply.github.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: Cojoke <83733158+Cojoke-dot@users.noreply.github.com>
Co-authored-by: Plykiya <58439124+Plykiya@users.noreply.github.com>
Co-authored-by: plykiya <plykiya@protonmail.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: JIPDawg <51352440+JIPDawg@users.noreply.github.com>
Co-authored-by: JIP <jipdawg93@gmail.com>
Co-authored-by: CookieMasterT <124045269+CookieMasterT@users.noreply.github.com>
Co-authored-by: TheKittehJesus <29379890+SamGithubAccount@users.noreply.github.com>
 2024-08-03 18:53:54 +03:00
RavmorganButOnCocaine
242d831ca5 Automatic changelog update 2024-08-03 15:24:49 +00:00
Aviu00
d4525a91e6 Fixes & more (#548) 
* - fix: Narsie not spawning, items not dropping on paralyze, cult tweaks.

* - fix: Diagonal grilles layer.

* - add: Cockroaches don't drop organs.

* - add: Magic hands now work on interact & disable context menu interaction.

* - fix: Shackles speech after doafter.

* - tweak: Reduce flashbang knockdown, check for CanLieDown.

* - tweak: Hspear limit.

* - tweak: Remove knockdown tile friction.

* - tweak: Engi belt in sus box.

* - fix: Constructs can hear cult chat.

* - fix: Desword audio.

* - fix: Context menu.

* - fix: Actually drop items on paralyze.

* - tweak: Revert range reduction.

* - add: Update thermal visibility.

* - add: NPCs can miss.

* - tweak: Update desc.

* - fix: Actually fix desword audio.

* - tweak: Secret weights & game presets.

* - fix: Cult stun.
 2024-08-03 18:23:46 +03:00
RavmorganButOnCocaine
7f7cb34c0c Automatic changelog update 2024-08-03 14:03:10 +00:00
ThereDrD0
68ae47c958 return old telebaton (#546) 2024-08-03 17:02:07 +03:00
RavmorganButOnCocaine
53528f626d Automatic changelog update 2024-08-03 12:59:20 +00:00
RedBurningPhoenix
aaee67ef51 StalinCVAR (#545) 2024-08-03 15:58:25 +03:00
RedBurningPhoenix
20df94720a NameFix by Reizor32 (#543) 2024-08-03 15:58:17 +03:00
RavmorganButOnCocaine
7ada0c8b6a Automatic changelog update 2024-08-03 12:54:23 +00:00
PuroSlavKing
6ea2f2baf8 [Tweak] Better Telescopic Baton (#544) 
* [Tweak] Better Telescopic Baton

* self defence loadout

* SDD4Inspector
 2024-08-03 15:53:19 +03:00
Jabak
64ad5900c8 Merge remote-tracking branch 'upstream/master' 2024-08-02 23:26:33 +03:00
RavmorganButOnCocaine
dad51d36a0 Automatic changelog update 2024-08-02 11:51:29 +00:00
Aviu00
27268d4e28 Better melee combat (#542) 
* - add: NextMobAttack, EquipCooldown.

* - fix: Some combat fixes.

* - add: Telebaton.

* - add: Stun baton rework.

* - tweak: Reduce melee range.

* - add: Rework melee block system.

* - add: ExaminedEvent.
 2024-08-02 14:50:26 +03:00
RavmorganButOnCocaine
6ca036189e Automatic changelog update 2024-08-02 09:33:49 +00:00
PointPNG
cca9105038 Update DryDock.yml (#540) 2024-08-02 12:32:45 +03:00
PuroSlavKing
32abd528ab [Feature] Sigma Crosshairs (#541) 2024-08-02 12:32:05 +03:00
RavmorganButOnCocaine
ea019f6272 Automatic changelog update 2024-08-01 19:53:05 +00:00
Spatison
78de2ea3e1 tweak: Изменены голобарьеры (#539) 2024-08-01 22:52:01 +03:00
RavmorganButOnCocaine
3841f3903b Automatic changelog update 2024-08-01 18:39:49 +00:00
ThereDrD0
e87ac6f5c9 fix meta.json (#537) 2024-08-01 21:38:45 +03:00
RavmorganButOnCocaine
6d54f43112 Automatic changelog update 2024-08-01 17:51:11 +00:00
PointPNG
376a56c60b Update DryDock.yml (#536) 2024-08-01 20:50:08 +03:00
Aviu00
c2fd356c5c Knockdown (#535) 
* - add: Better knockdown.

* - add: Some stuff.

* - add: Ghetto alert.
 2024-08-01 20:49:56 +03:00
RavmorganButOnCocaine
5df2d4586e Automatic changelog update 2024-08-01 17:49:47 +00:00
PointPNG
ff223c9eda Update Whitebox.yml (#534) 2024-08-01 20:48:42 +03:00
Jabak
18cca8a41b Merge pull request #105 from frosty-dev/ups 
Ups
 2024-08-01 11:24:55 +03:00
Jabak
26cd9ad80c Merge remote-tracking branch 'upstream/master' into ups 2024-08-01 11:20:57 +03:00
RavmorganButOnCocaine
4a860c46b5 Automatic changelog update 2024-08-01 05:43:44 +00:00
PointPNG
d3cf7c8163 DryCock update (#528) 2024-08-01 08:42:41 +03:00
ThereDrD0
ae4b7834b7 Респрайт всего связанного с клоуном (#529) 
* resprite all clown stuff

* commit 2
 2024-08-01 08:42:28 +03:00
RavmorganButOnCocaine
9d06988591 Automatic changelog update 2024-08-01 04:09:32 +00:00
ThereDrD0
80c353066e fix tape stuck (#527) 2024-08-01 07:08:29 +03:00
RavmorganButOnCocaine
c3d2129ffd Automatic changelog update 2024-08-01 03:58:29 +00:00
ThereDrD0
567afd55c1 Респрайты алертов (#526) 
* bleed alert respire + remove hardcoded shit from bloodstreamSystem

* resprite thirst icons

* ensnared alert meme resprite
 2024-08-01 06:57:26 +03:00
RavmorganButOnCocaine
3140e7b9e9 Automatic changelog update 2024-08-01 02:16:06 +00:00
ThereDrD0
f00e0a6fb5 Глобальный респрайт оружия 2 (#522) 
* its literally brainkilling

* нихуя не понял, но работает
 2024-08-01 05:15:03 +03:00
RavmorganButOnCocaine
cf4763f8f2 Automatic changelog update 2024-08-01 00:37:20 +00:00