Commit Graph

8 Commits

Author SHA1 Message Date
vanx
d12c37cbf5 [Add] More Weapons Locale (#569)
* russia number 1

* omg wtf

* ok

* a

* review

* fix

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 19:56:02 +03:00
Spatison
7d72b86d19 Reapply "Hot reload 2: Electric Boogaloo" (#524) (#525)
* Reapply "Hot reload 2: Electric Boogaloo" (#524)

This reverts commit d856b8e7a0.

(cherry picked from commit c02e513f4f26877f2fc69478a0701ab9e751d603)

* blya

(cherry picked from commit 777edbfbd9ef560c511505e4811d1d59ce4c81ee)
2025-05-27 14:02:22 +03:00
DVONIKS
d856b8e7a0 Revert "Hot reload 2: Electric Boogaloo" (#524)
Revert "Hot reload 2: Electric Boogaloo (#518)"

This reverts commit 2fd1dd9a51.
2025-05-27 13:50:09 +03:00
RedFoxIV
2fd1dd9a51 Hot reload 2: Electric Boogaloo (#518)
* What have i become?

My sweetest metagang

* Everyone i know disconnects

In the end

* And you could have it all

My repo of dirt

* I will let you down

I will make you hurt

* I wear this crown of commits

Upon my liar's branch

* Full of broken code

I cannot compile

* Beneath the stains of time

The comments disappear

* You are someone else

I'm still down here

* What have I become?

My sweetest metafriend

* Everyone i know gets perma'd

In the end

* And you could have it all

My broken repo

* I will let you down

I will get you banned

* If i could start again

A million servers away

* I would keep myself

I would find a way

* ...

* . . .

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* какая удобная фича

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* .  .  .

* mnda

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

---------

Co-authored-by: Boevi4ok <156510964+89Eblan@users.noreply.github.com>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-05-27 00:56:11 +03:00
DVONIKS
8eed4ab003 Revert "Hot reload" (#517)
Revert "Hot reload (#500)"

This reverts commit c754a645d7.
2025-05-25 18:16:04 +03:00
RedFoxIV
c754a645d7 Hot reload (#500)
* What have i become?

My sweetest metagang

* Everyone i know disconnects

In the end

* And you could have it all

My repo of dirt

* I will let you down

I will make you hurt

* I wear this crown of commits

Upon my liar's branch

* Full of broken code

I cannot compile

* Beneath the stains of time

The comments disappear

* You are someone else

I'm still down here

* What have I become?

My sweetest metafriend

* Everyone i know gets perma'd

In the end

* And you could have it all

My broken repo

* I will let you down

I will get you banned

* If i could start again

A million servers away

* I would keep myself

I would find a way

* ...

* . . .

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Update Resources/Prototypes/DeltaV/Entities/Objects/Weapons/Guns/Battery/battery_guns.yml

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* какая удобная фича

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* .  .  .

* mnda

Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>

* Apply suggestions from code review

* Apply suggestions from code review

---------

Co-authored-by: Boevi4ok <156510964+89Eblan@users.noreply.github.com>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-05-25 02:26:27 +03:00
Debug
122e99302b Fix Delta stuff 2024-01-26 23:29:17 +01:00
Fluffiest Floofers
bad35e181a Energy Guns (#385)
* gee

* forgor comments

* licence for audio

* Update equipped-BELT.png

* Makes the sprite change but shitcode

Because shitcode makes everyone happy

* it only got two of them firemodes lets not lie

* We can name this appropriately now

* Apply 3 suggestions from code review

Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>

* update sources

* Energy Gun + more firemodes

its still energygun only

---------

Signed-off-by: Fluffiest Floofers <thebluewulf@gmail.com>
Co-authored-by: DEATHB4DEFEAT <77995199+DEATHB4DEFEAT@users.noreply.github.com>
2023-11-15 19:41:00 +01:00