Commit Graph

453 Commits

Author SHA1 Message Date
Spatison
74b96fc9df remove DV CanEdit paper 2025-07-20 14:18:31 +10:00
SlamBamActionman
08c135cd49 Add Holy damage (#32755)
* Initial commit

* hoili moili

* now to add sherlock and doctor who

* funny stick

* Oops it was meant to be called metaphysical

* Attribution

* Even BETTER attribution
2025-07-20 14:05:02 +10:00
Jonathan
5c69712225 Bad Spawn-Point Job-Courier (#2482)
Howdy y'all, I wanted to bring to your attention that I've been
experiencing problems with the "Courier" spawn point on this EE for a
while now. First, the spawner itself doesn't work. When placed, the map
attempts to load, fails, and then crashes, returning everyone to the
lobby.

You can use the spawn point Mail carrier instead.

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/8d5394b7-ebb1-4074-8e0f-22abd5dd687e

</p>
</details>

🆑 Mike32oz
- remove: Courier spawn-point
2025-07-20 13:24:01 +10:00
Nemanja
bff0c6cdba anonymize salvage wrecks (#31087)
* anonymize salvage wrecks

* display wreck size

(cherry picked from commit 8440fb6acb6e5e18c8035140b2b17644404c38d7)
2025-07-19 15:40:11 +10:00
Ed
b030099cdd JobRequirement refactor (#30347)
* refactor JobRequirements

* add profile support

* fix

* Update quartermaster.yml

* sloth fixes

* inport 30208

* Update DepartmentPrototype.cs

* species restriction

* left tweak stick

* stringbuilder is cool!

(cherry picked from commit a95d2257c35dca930ff8eb9eebf82409a5d5645f)
2025-07-19 14:44:43 +10:00
Nemanja
69ac5801d1 split temperature protection into heating and cooling (#30662)
* split temperature protection into heating and cooling

* fugg

* weh

(cherry picked from commit a197baac17154642c4631f59618827104711134c)
2025-07-19 12:40:28 +10:00
Moomoobeef
8d78d65055 Adds flavors to a bunch of things without them (#31685)
* initial commit

* VSCodium is being dumb

I don't know why vscodium thinks I modified this whitespace when this is infact how I wrote it in the first place, but it's being dumb and I think if I reset in order to put it in the initial commit I'll have to rebase again so :P. go go gadget single byte commit

* but wait, there's more!

* missing newline
2025-07-18 15:52:09 +10:00
Spatison
0457f054fd remove DeltaV ClothingBeltSuspendersBlack 2025-07-17 11:43:07 +10:00
Mangohydra
7edbbe6c0c The lawyer finally gets a stamp (#26012) 2025-07-15 11:59:39 +10:00
Mr. 27
dea030f462 Job starting gear is now defined in the starting gear rather than backpack prototypes (#27605) 2025-07-15 11:54:26 +10:00
deltanedas
254a775a71 make objectives use entityCategory (#28269)
(cherry picked from commit 8d78b7442af48ff87607efbcdfb4692a00678daa)
2025-07-14 16:33:37 +10:00
Spatison
e11b836358 make vending machine use localizedDataset 2025-07-12 15:30:44 +10:00
Ed
6a634fc84e Displacement maps big update (#30093) 2025-07-12 15:30:27 +10:00
slarticodefast
a8716ba679 Flash overlay rework and bugfixes (#27369) 2025-07-12 14:26:42 +10:00
Will-Oliver-Br
c00f942bb1 Port SmartFridge Functionality (#2479)
# Description

Port smartfridge functionality from
[Delta-V](https://github.com/DeltaV-Station/Delta-v) and commits from
[Frontier](https://github.com/new-frontiers-14/frontier-station-14)
Pr and commits:
https://github.com/DeltaV-Station/Delta-v/pull/3207

70a9032085

2d4abf62b7

---

<details><summary><h1>Media</h1></summary>
<p>


https://github.com/user-attachments/assets/a67f78ca-327c-4e08-8e34-8be6a1a59eac

</p>
</details>

---

# Changelog

🆑 sowelipililimute, Whatstone and Will-Oliver-Br
- tweak: SmartFridge now really has functionality

---------

Co-authored-by: pathetic meowmeow <uhhadd@gmail.com>
Co-authored-by: Whatstone <whatston3@gmail.com>
2025-07-12 12:42:31 +10:00
Spatison
11de37a7b8 some wizmerge fixs 2025-07-12 03:02:43 +10:00
deltanedas
876e1cf402 add tape recorder (#2498)
* add tape recorder

* add filled tape recorder to trinkets

* :trollface:

* :trollface:

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-07-12 03:01:19 +10:00
Spatison
34657e9f57 Remake gasp popup to emote (#27736) 2025-07-12 01:47:35 +10:00
Cojoke
61813c69d0 some wizmerge fix: part 2 2025-07-12 01:47:33 +10:00
VMSolidus
1975b877e6 Machine Languages (#2426)
# Description

This PR fixes a bug whereby the Holopads weren't respecting languages,
and actually basically every machine in the entire game wasn't. There's
an in-general broader issue that I would reaaaaaally like if UI elements
in general could be differentiated by language, but that's a lot harder
to do than this fix. This was shockingly easy to fix actually.

# Changelog

🆑
- fix: Holopads now correctly respect the speaker's language, and
transmit said language to the receiver. They are no longer Universal
translators. Have fun yelling at people over the holopad in whatever
obscure language your character knows.
- fix: Nearly every machine that can speak, now correctly respects that
languages exist. For example, mice can now no longer understand what
vending machines are saying.
2025-07-12 00:55:52 +10:00
vanx
b90965177f [Add] Alert Level Locks (#635)
* alert lock pog

* locale

* fix

* make it better

* count

* review

* review 2

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-07-05 12:22:19 +10:00
vanx
ac38c588eb [Tweak] Gunplay (#630)
the gunnening

Co-authored-by: vanx <discord@vanxxxx>
2025-06-30 15:46:54 +10:00
vanx
b1a50fb20f [Fix] Surgery Speed (#626)
surger

Co-authored-by: vanx <discord@vanxxxx>
2025-06-28 11:11:26 +03:00
vanx
040a3b0bdf [Remove] Kammerer Chokes (#612)
no choking

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 20:47:12 +03:00
vanx
f491cbfeac [Add] More Butcherable Clothes (#613)
* butcher them

* fix

* #WWDP

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 20:18:12 +03:00
vanx
f017eed684 [Fix] Role Timers (#607)
the timering

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 20:13:04 +03:00
vanx
cf0df4d80f [Tweak] Ghost Roles Loadous & Locale (#585)
* i love locale

* cburn

* Update backpacks.yml

* fdix

* review

* magboots

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-19 20:00:56 +03:00
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
vanx
1d953e0928 [Fix] FIREEEEEEEEE (#594)
* wow much fire

* drop children (in code)

* fix

* oops

* fix

* TemperatureProtection

* Update Resources/Prototypes/_White/Body/Parts/resomi.yml

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

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-06-19 19:53:51 +03:00
vanx
475b4007ab [Add] Multiphase Ion Mode (#597)
ion

Co-authored-by: vanx <discord@vanxxxx>
2025-06-16 20:42:52 +03:00
vanx
a1bf518d37 [Tweak] Emag Is Back (#581)
emag 2

Co-authored-by: vanx <discord@vanxxxx>
2025-06-13 22:48:06 +03:00
vanx
4c3104ec3f [Add] Diegetic Crafting (#578)
* small fix

* review

* crystallpunk (do not abbreviate)

* fix typo

* linter

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-13 22:46:47 +03:00
vanx
e5c18181b3 [Tweak] Starting Loot (#558)
* telescopi4ka is back

* captin

* hop & removed unused roles loadouts

* cyberiad is back

* remove shitty role loot migration

* captain 2

* engineering

* teleskopi4ka 2

* teleskopi4ka 3

* medical

* security

* cargo

* sci/epi

* service

* misc items

* linter

* small things

* useless boots

* review

* Revert "cyberiad is back"

This reverts commit f50b0d3dc6.

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-11 11:06:58 +03:00
vanx
f6ea129ea8 [Fix+Tweak] Surgery Speed (#564)
* surgery speed

* Update Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-06-09 21:21:01 +03:00
vanx
ab24291b63 [Add] Abandoning Your Listening Post = DEATH (#544)
* lol

* fix

* locale separate file

* АЙ ЛАВ #ВВДП

---------

Co-authored-by: vanx <discord@vanxxxx>
2025-06-09 20:06:18 +03:00
vanx
041a1bec9c [Tweak] Smol Rol Timers (#459)
* rol timer

* Update Resources/Prototypes/_White/Roles/Jobs/Command/maid.yml

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-06-05 19:19:12 +03:00
vanx
c1b51ed7d6 [Tweak] Sec Guns Rebalance (#539)
* pog gers

* webedit lol

* Apply suggestions from code review

---------

Co-authored-by: vanx <discord@vanxxxx>
Co-authored-by: Spatison <137375981+Spatison@users.noreply.github.com>
2025-06-03 20:24:04 +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
Spatison
672f9d7ec6 [Revert] Magboots Refactor (#495)
* Revert "Magboots Refactor (#2273)"

This reverts commit b9e2c6f34d.

* revert speedboots fix

* no more modify stun time on magboots

* Revert "Stop Ectoplasms Complaining (#2245)"

This reverts commit ee5bc2b261.

* Revert "The Magmantle! (#2295)"

This reverts commit 581088f3

* Revert "Integrated Jetpacks For Syndicate Modsuits (#2300)"

This reverts commit 5ee67e380b.
2025-05-17 14:27:53 +03:00
Raikyr0
1b51f9f9ca Garand Ping (#2399)
# Description

Adds the iconic Garand Ping to the Mark 1 Rifles

Changes it so Mark 1 Rifles are now Rifle Parent instead of Sniper
Changed it so it uses a en-block magazine (nightmare coding) which you
can print from sec, ammo and emagged autolathe.

Thanks to @ItsDzordz for making sure it didn't explode and testing.

# Changelog

🆑
- add: PING

---------

Signed-off-by: Raikyr0 <Kurohana@hotmail.com.au>

(cherry picked from commit 3240d26f8d04276fc1a9dcba447dd26f7b13e536)
2025-05-10 01:29:13 +03:00
EctoplasmIsGood
8be899a642 Surgery Fixes (#2370)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Abductor and medical cyborgs are meant to have a surgery speed buff and
the ability to bypass clothing for surgery, but this didn't seem to have
been added with the abductor port, so I went in and fixed that. Frankly,
medical borg entity prototypes are all over the place, so this is all
kinda wacky until we cut down on the 40 different needless variants.

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/2eb9b61c-545c-4040-be60-9f7a130e2106

</p>
</details>

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- fix: Abductor & Medical borg now have their proper surgery speed buffs
and their clothing bypass

---------

Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit 4630912c2ab62e1552ffd831cf690406011e37af)
2025-05-10 00:23:13 +03:00
EctoplasmIsGood
b6b9b6dfc3 Remove Teach a Lesson (#2365)
https://github.com/Simple-Station/Einstein-Engines/pull/2362

Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>

(cherry picked from commit ed67011a8c86a510a7823f8c679d2ccd5f1e0c43)
2025-05-10 00:22:46 +03:00
ZetaNull
e47aac8dc1 Move Chitinid Visuals to Moth Markings and Get Rid of Their Guidebook Entry. (#2354)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Title. This is done so that we can disable Chitinids to get rid of the
frankly _horrific_ performance implications they come with without
upsetting as many people. Chitinids are only not disabled in this PR
because of the fact there's [another
PR](https://github.com/Simple-Station/Einstein-Engines/pull/2353) that
just does that.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

![image](https://github.com/user-attachments/assets/bc28bc2f-ac09-4418-b668-e50152be748f)

![image](https://github.com/user-attachments/assets/1e891226-f295-427b-85e6-f169e1c602c1)

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑 Zeta_Null
- add: Added Chitinid visuals to moth markings, to make their overall
removal something that causes less trouble
- remove: Removed Chitinids from the guidebook

(cherry picked from commit 64e827dbc0314c897a8e3004dab1b1a8f0d17dac)
2025-05-03 01:44:19 +03:00
VMSolidus
e0feffd178 Disable Chitinids (#2353)
# Description

Re-enable these if and only if you are fixing their shitcode.

# Changelog

🆑
- remove: Chitinids have been disabled due to being a server performance
nightmare.

(cherry picked from commit 2164a2b79fc206d6cda1059021820c6685991212)
2025-05-03 01:42:52 +03:00
dootythefrooty
51183826cc AI Slaving Delta-V Port (#2320)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

Ports AI Slaving from Delta-V. The ObeyAI law now isn't specified in the
lawsets. This should also prevent the ObeyAI law from getting out of
order.

---

<!--
This is default collapsed, readers click to expand it and see all your
media
The PR media section can get very large at times, so this is a good way
to keep it clean
The title is written using HTML tags
The title must be within the <summary> tags or you won't see it
-->

<details><summary><h1>Media</h1></summary>
<p>

https://github.com/user-attachments/assets/ecc42760-b9a3-4df7-ac5e-ca0a589af74a

</p>
</details>

---

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑

- fix: Law boards will no longer give the Station AI a law that makes
them obey themselves.
- fix: Chassis Selection Medi-Borgs can dispense candy now.

---------

Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: Timfa <timfalken@hotmail.com>
(cherry picked from commit 2efb33a455e73d669042c0ff5a2ab3065abcdd91)
2025-05-03 01:26:25 +03:00
EctoplasmIsGood
84bb1e8793 Disable/Migrate Grappling Gun, Tether Gun, and Force Gun. (#2328)
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

These three items are built off of shitcode, and they like throwing
errors / causing problems, so until someone takes the time to fix them,
I'm going to be disabling them.

For safety (just incase they were mapped for some reason) Theyve also
been migrated to null

# Changelog

<!--
You can add an author after the `🆑` to change the name that appears
in the changelog (ex: `🆑 Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

🆑
- remove: Disabled grappling guns, tether guns, and force guns

---------

Signed-off-by: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

(cherry picked from commit 81b32f1bf47cad2c1ee2c24c121dd2caa96ffdfa)
2025-05-03 01:26:05 +03:00