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

679 Commits

Author SHA1 Message Date
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
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
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
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
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
Valtos
28a37dcd70 New tts voices 2 (#344) 
* Update tts-voices.yml

* Update tts-voices2.ftl
 2024-06-10 00:30:35 +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
38ae317e71 Merge remote-tracking branch 'upstream/master' 2024-06-08 22:36:55 +03:00
Aviu00
d838e850c6 Ling tweak & faction cleanup (#337) 
* - tweak: Ling tweaks.

* - fix: Faction cleanup.
 2024-06-08 16:03:20 +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
2978834228 Esword stuff (#329) 
* - fix: Fix black RGB.

* - add: Toy sword update.

* - add: FlipOnHitSystem.

* - tweak: Price reduction.
 2024-06-05 17:31:21 +03:00
Jabak
d2b24c049d Merge remote-tracking branch 'upstream/master' 2024-06-03 19:54:40 +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
7282ac2471 Merge remote-tracking branch 'upstream/master' 2024-05-27 08:43:42 +03:00
Stasvozgalov
5777737868 Binary-channel-fix (#312) 2024-05-23 02:54:27 +03:00