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
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
RavmorganButOnCocaine
ccbbeb1d02 Automatic changelog update 2024-07-06 03:59:01 +00:00
ThereDrD0
9d74370e7a fix: fix translation bugs (#425) 2024-07-06 06:57:58 +03:00
RavmorganButOnCocaine
0e1177ed53 Automatic changelog update 2024-07-06 03:15:36 +00:00
PointPNG
65f315f2b3 Update WonderBox (#423) 2024-07-06 06:14:33 +03:00
PointPNG
8009d1abc2 WhiteBox update (#424) 2024-07-06 06:14:25 +03:00
Jabak
8d635232d7 Merge remote-tracking branch 'upstream/master' 2024-07-05 21:22:42 +03:00
rhailrake
f56f0735b8 Merge remote-tracking branch 'origin/master' 2024-07-05 23:14:35 +05:00
rhailrake
eced84e98e master 2024-07-05 23:14:06 +05:00
RavmorganButOnCocaine
2cfe6b34c9 Automatic changelog update 2024-07-05 18:00:41 +00:00
ThereDrD0
085c863c95 fix: fix discord round ended message (#422) 2024-07-05 20:43:49 +03:00
RavmorganButOnCocaine
5139e1e6b4 Automatic changelog update 2024-07-05 16:05:08 +00:00
RedBurningPhoenix
eb09490796 Meteor Fix (#420) 2024-07-05 21:04:04 +05:00
RedBurningPhoenix
70389e9498 Revert commit 0c23d53 2024-07-05 20:43:05 +05:00
RedBurningPhoenix
0f6f808625 NEEDED 2024-07-05 20:27:45 +05:00
RedBurningPhoenix
1283d3f63b Revert "Meteors fix" 
This reverts commit 5e43d2170e.
 2024-07-05 20:17:18 +05:00
RedBurningPhoenix
5e43d2170e Meteors fix 
Уменьшение Здоровья метеоритов, таймингов прилёта и их кол-во.
 2024-07-05 20:15:24 +05:00
ThereDrD0
8fb2cc946d МЕГАпереводы (#418) 
* add: 1000 translation files

* add: translations p2

* translations p3

* translations p4

* finally done

* fixes

* fixes 2

* fixes 3
 2024-07-05 18:01:37 +03:00
DVONIKS
0c23d53d77 Функциональное отключение метеоритного дождя 
До лучших времён, слишком грифонит станцию и игроков, а как-либо придумать решение пока ресурсов нет.
 2024-07-05 17:18:52 +03:00
RavmorganButOnCocaine
74ee432348 Automatic changelog update 2024-07-05 07:10:54 +00:00
ThereDrD0
e183545664 add: gnome resprite (#419) 2024-07-05 10:09:51 +03:00
Jabak
03ee041be9 Gender Swap 2024-07-03 11:17:58 +03:00
RavmorganButOnCocaine
9d0984a105 Automatic changelog update 2024-07-02 22:13:39 +00:00
ThereDrD0
f89a850e6d Clipping a harvestable plant yields undamaged seeds (#25541) (#417) 
Clipping a plant in any condition currently causes it and its clippings to be damaged.

Make clipping harvestable (already eligible for seed extractor) plants yield seeds at full health.

Co-authored-by: botanySupremist <160211017+botanySupremist@users.noreply.github.com>
 2024-07-03 01:12:36 +03:00
RavmorganButOnCocaine
1292661ccf Automatic changelog update 2024-07-02 22:04:43 +00: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
RavmorganButOnCocaine
317f24da0c Automatic changelog update 2024-07-02 20:24:15 +00:00
ThereDrD0
d8ffea1ee8 Апстрим некоторого из ботаники (#415) 
* Rainbow Weed (#25759)

* rainbow weed

* Lipolicide

* psicodine + mannitol

* happiness

* ground + dried + smokables

* damn you notepad++

* fix

WHY NOT TELL ME ALL THE PROBLEMS AT THE SAME TIME!!!

* work

* work i beg you

* recipe good

* possibly fix merge conflict

* remove reagents

* Psicodine, Mannitol, Lipolicide and Happiness (#27134)

* reagents

* Update Resources/Locale/en-US/reagents/meta/narcotics.ftl

---------

Co-authored-by: Kara <lunarautomaton6@gmail.com>

* fix cannabis

* Killer tomatoes (#26053)

* make tomatoes

* many friends! many mommies

* finish

* renaming system

* fix

* Update miscellaneous.yml

* Update Content.Server/NPC/Systems/NPCImpritingBehaviourSystem.cs

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>

* N

* deleete exception?

* merge conflict fix

* fix?

* fuck you

* sloth fixes

* fixess?

* fix

---------

Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>

* Small tomato killer tweak (#27265)

* Update miscellaneous.yml

* Update mobspawn.yml

* Update miscellaneous.yml

* Update miscellaneous.yml

* Spaceman's Trumpet and Lily (#25090)

* trumpet + lily +polypy

* trumbet

* Change plant clipping mechanics (#25326)

Make seeds from clipped plants inherit the decreased health from parents.
Also require one growth stage before clipping.

* fixes

* Resprite & hand position correction of Nettle & Death Nettle (#25421)

Resprite of Nettle & Death Nettle. Corrected R & L hand locations for all orientations of both plants.

* Remake hairflowers (#25475)

* Add more lily usage (orange hairflower and flowercrown)

* comit 2

* ee

* more fixes

* w

* im stupid

* bring poppy in authodrobe

* weh

---------

Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>

* Revert "Remake hairflowers (#25475)"

This reverts commit 6b2a9b96b18a6c854c3aea149611d7dd496518c0.

* Make Holy Water more like Water (#27068)

holy water can now be used to satiate thirst, water plants, and extinguish fires.

* New plant mutation: Pyrotton (#27200)

* WIP

* sprites n stuff

* flavour

* maybe fix

* add stack

* fix parent

* Rewords plant/effect descriptions for clarity (#28156) (#28169)

* Rewords plant/effect descriptions for clarity (#28156)

* Forgot Robust Harvest.

* Update Resources/Locale/en-US/guidebook/chemistry/effects.ftl

---------

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

---------

Co-authored-by: potato1234_x <79580518+potato1234x@users.noreply.github.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: Flesh <62557990+PolterTzi@users.noreply.github.com>
Co-authored-by: MjrLandWhale <brandonemitch@gmail.com>
Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Co-authored-by: Ghagliiarghii <68826635+Ghagliiarghii@users.noreply.github.com>
Co-authored-by: Ubaser <134914314+UbaserB@users.noreply.github.com>
Co-authored-by: alex-georgeff <54858069+taurie@users.noreply.github.com>
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-07-02 23:23:12 +03:00
Jabak
35edf6460a Merge remote-tracking branch 'upstream/master' 2024-07-02 21:26:29 +03:00
Remuchi
d63d3521ee feat: гост рейдера (#414) 2024-07-02 23:33:16 +07:00
RavmorganButOnCocaine
18363abde0 Automatic changelog update 2024-07-02 15:57:56 +00:00
Remuchi
55a225f574 [Fix] Потенциальный фикс ТТС (#413) 
* fix: possible tts fix??

* style: не втыкай
 2024-07-02 18:56:53 +03:00
RavmorganButOnCocaine
6be08b4506 Automatic changelog update 2024-07-02 15:13:33 +00:00
ThereDrD0
3b166c0344 Gnomes upgrade (#412) 
* add: raffle for gnomes

* tweak: gnomes are contraband now

* tweak: less damage on pressure
 2024-07-02 18:12:29 +03:00
RavmorganButOnCocaine
80cdf50aae Automatic changelog update 2024-07-02 09:56:41 +00:00
ThereDrD0
104ffcb0e3 Фиксы метеоров (#410) 
* Missing meteor presets (#29044)

* add meteors into missing game presets

* changes for real

* implement code

* this too

* Revert "Missing meteor presets (#29044)"

This reverts commit d6554159b30d395b2ab0a1e47b67efcf895be903.

* add: more meteors

* add: less meteors

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
 2024-07-02 12:55:38 +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
RavmorganButOnCocaine
80d87a255f Automatic changelog update 2024-07-01 13:47:59 +00:00
ThereDrD0
44fdf8c605 Less channels (#409) 
* fix: fix station announcement

* tweak: less audio channels to announce
 2024-07-01 16:46:56 +03:00
RavmorganButOnCocaine
c504cf929c Automatic changelog update 2024-07-01 13:28:25 +00:00
Aviu00
b24cff72c9 - fix: Revert flammable changes. (#408) 2024-07-01 16:27:22 +03:00
RavmorganButOnCocaine
ddf9bea8a2 Automatic changelog update 2024-07-01 13:03:55 +00:00
ThereDrD0
d9aa2f16f5 fix: fix station announcement (#407) 2024-07-01 16:02:51 +03:00
RavmorganButOnCocaine
0a226502d5 Automatic changelog update 2024-07-01 11:37:18 +00:00
ThereDrD0
d3413b9a40 Hot fix (#406) 
* Revert "Hot revert (#403)"

This reverts commit 65283e1c44.

* hotfix
 2024-07-01 14:36:20 +03:00
Aviu00
7e260940e0 - tweak: Spear. (#405) 2024-07-01 14:36:15 +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
RavmorganButOnCocaine
494811a667 Automatic changelog update 2024-07-01 10:11:35 +00:00
ThereDrD0
a87b5295bc add: notification upon head arrival (#402) 2024-07-01 13:10:32 +03:00