Commit Graph

1024 Commits

Author SHA1 Message Date
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
IProduceWidgets
6bcf356515 Impliment visitor ID, reorganize shuttle event and ghost role yml, standardize many visitor roles, add more unknown shuttles. (#28098)
* Add Protagonists

* Give visitors the right PDA at least, we need that RP value.

* tidy up

* spell check my beloved

* Everything about jobs have the same id names ahhhh!

* s

* rarity scarity.

* Update Resources/Locale/en-US/ghost/roles/ghost-role-component.ftl

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

* cargo event now no has cargo access doors.

* break everything.

* still WIP, please excuse.

* finish all role loadouts

* extra roles, fix up grids, special pdas.

* Ghost role descriptions and mime powers

* rest of the fucking owl

* I tripped.

* I also fell.

* Fix the broken entity storage?

* hide mess under rug

* Stuff the rest of the mess into a closet.

* I forgor a spinny majig.

* a small lighting tweak.

* 1984 shuttles to new pr.

* 1984 shuttles to new pr 2 electric boogaloo

* poke the tests

* Revert "1984 shuttles to new pr 2 electric boogaloo"

This reverts commit b2ea7053b73cb17b59f8a80b23978a04a6a45a56.

* cowboy boot cleanup

* tableify

* antagimmunities

* Should be functional.

* vox safing

* un1984 clowns I guess

* oops forgor one

* misplaced file

* misplaced file v2

* weird test fail but okay

* Shuttles rarer

* Shuttle testing, fans, and power sanity. Also return of the syndie evac.

* le balance

* no write over fancy paper

* rerun tests

---------

Co-authored-by: Tayrtahn <tayrtahn@gmail.com>

(cherry picked from commit 62f268cbb03b6b5d5e6a642aed7aab1e00f91b43)
2025-07-20 13:57:59 +10:00
Kai5
ae1c1c39dd Port Devil (#2454)
<!--
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
-->

<!--
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]?
-->

This PR ports
https://github.com/Goob-Station/Goob-Station/pull/2409
https://github.com/Goob-Station/Goob-Station/pull/2591
https://github.com/Goob-Station/Goob-Station/pull/2599

This PR was initially intended to be merged into White Dream repo, so my
changes are marked as WD edit.

<!--
A list of everything you have to do before this PR is "complete"
You probably won't have to complete everything before merging but it's
good to leave future references
-->

- [ ] Port pain numbness
- [ ] Port nullrods
- [ ] Port tile movement

---

<!--
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/ee4679d1-fc07-4dc3-8063-e0220bc0d728)

![image](https://github.com/user-attachments/assets/25f590b9-6bf3-43bd-aca3-80452f27b0dd)

![image](https://github.com/user-attachments/assets/1ffb5bb3-e0c7-4827-8193-83bd8480e555)

![image](https://github.com/user-attachments/assets/4ed8c762-1e51-4bd8-9800-6495c12ac68f)

</p>
</details>

---

<!--
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
-->

🆑
- add: Ported Devil antag from Goobstation

---------

Signed-off-by: Kai5 <68296202+Kai518@users.noreply.github.com>
Signed-off-by: VMSolidus <evilexecutive@gmail.com>
Co-authored-by: Solstice <solsticeofthewinter@gmail.com>
Co-authored-by: VMSolidus <evilexecutive@gmail.com>
2025-07-20 13:37:35 +10:00
Nemanja
398fc5cd98 Hivelord mob (#31322)
* Hivelord

* make it longah

(cherry picked from commit e510504596f992744cfe62cdf26aa12f38ff6aa2)
2025-07-19 15:43:29 +10:00
beck-thompson
58e8d6d56c Fix nukies not getting station codes (#31272)
First commit

(cherry picked from commit d44bbec05de0641cb31260b3ad11368f565096cf)
2025-07-18 15:51:11 +10:00
Nemanja
d280821ef9 add space carp and sharkminnow teeth (#31070)
(cherry picked from commit 0a05ee9a27ecce39c0c4923ac9a9b41c1d18d50b)
2025-07-18 15:51:11 +10:00
potato1234_x
beed765e5b Tea Plant and Blue Pumpkin (#25092)
* tea plant, blumpkin

* fix linter

* fix tests pls

* bloompkin

* forgor rsi

* work please

* WORK PLEASE

* migration of the blumpkins

* it is now glumpkin

* lowercase

* uppercase

* adjust values and fix blorbo

wtf when did blumpkin donut turn into blorbo donut what

* fix test

* update

* fix stupid mistake

* Update meta.json

* totally not a webedit

* not a webedit 2

* nitpicks

(cherry picked from commit 19526182035345c5cf8c675691666ee2c7ffa5ec)
2025-07-18 15:51:09 +10:00
DrEnzyme
5163fafb2b Add bagels (#24799)
Bagels are made by using a rolling pin on a dough slice to make a dough rope, then cooking the dough rope in a microwave for 5 seconds. There are two types: a normal bagel and a poppyseed bagel. The poppyseed bagel requires a poppy and a dough rope and has a small (5u) quantity of Bicaridine inside of it in addition to its nutriment.

Co-authored-by: Kevin Zheng <kevinz5000@gmail.com>
(cherry picked from commit 659010993fef23b707a646008495cf17f32af700)
2025-07-18 15:51:08 +10:00
Tayrtahn
81aad95215 Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865)
* Add fill level sprite support for equipped items

* Add fill sprites for held/equipped spears

(cherry picked from commit ed4ae1628c1fbea528dd4a320efc6fd402a7ccfd)
2025-07-17 14:30:28 +10:00
Jonathan Argo
538d620b44 Made musket wieldable. (#29910)
* Made musket wieldable.

* Updated musket rsi meta.json copyright.

* Copyright adjustment again.

(cherry picked from commit 00a2c6a234d7b4bae7895161c9ce0c6892d5514c)
2025-07-17 14:17:27 +10:00
Alzore
fcb2117b63 Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947)
* no more lasers for you, borg.

* downgrade

* echis

* echis

* itemtoggleupdate

* daggerparenting

* fixtypo

* more bullet per bullet

(cherry picked from commit c8725825bee29d3c314e7e357767c09a55a4e34c)
2025-07-17 12:34:42 +10:00
Ilya246
7613e3ce01 ghost locator maints loot (#32323)
* implement

* react to revenants/AI eye

* rare maints loot

* sprite

* description

* review

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* do changes

* stats

* networked

---------

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>
(cherry picked from commit fca95ef250c3ffbbf139d732df3c4e104efa6801)
2025-07-17 11:23:35 +10:00
xprospero
685926b6a7 Rubber chicken toy (#29637)
* -added rubber chicken toy

* -Removed faulty SolutionContainerManager type

-Replaced default toy squeak sound with rubber chicken sound for on-trigger and on-collide.

* fixed raw material cost

* adjusted material composition

* - Added rubber chicken to CrateFunToyBox
- Added rubber chicken to MaintFluffTable under "uncommon group" so that it will spawn in maintenance

* Update Resources/Prototypes/Entities/Objects/Fun/toys.yml
2025-07-17 11:23:32 +10:00
ArtisticRoomba
1f5657ffd1 Adds the Head of Greytide stamp (#30189)
suggested changes from discord discussion, sprite change, add to refactored loot table

(cherry picked from commit adea4c91dec874c74a140ebe40fb2a6561546787)
2025-07-16 17:37:47 +10:00
keronshb
e12e385d60 Ethereal Jaunt Spell for Wizard & Jaunt ECS (#33201)
* Act

* Adds Jaunt ECS and related prototypes

* Adds jaunt sounds

* Adds enter and exit sound support to polymorphs

* Updates jaunt description

* Adds jaunt action sprite and changes jaunt polymorph to use it

* Adds Jaunt and upgrade to the wizard grimoire

* Makes base mob jaunt parent off of incorporeal and basemob, adds blue ghost sprite for ethereal jaunt

* Update Resources/Locale/en-US/store/spellbook-catalog.ftl

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Resources/Prototypes/Entities/Mobs/Player/jaunt_mobs.yml

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* Update Content.Shared/Polymorph/PolymorphPrototype.cs

Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

* removes meta changes

* removes other meta changes

* adds context menu and a description to basemobjaunt

* comments for jaunt component and adds on component shutdown method

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Content.Shared/Jaunt/JauntComponent.cs

* Update Resources/Prototypes/Catalog/spellbook_catalog.yml

---------

Co-authored-by: lzk <124214523+lzk228@users.noreply.github.com>
Co-authored-by: slarticodefast <161409025+slarticodefast@users.noreply.github.com>

(cherry picked from commit fa3a04a5273c77bba4f3545dfedebaa61bd2f5aa)
2025-07-16 17:08:20 +10:00
Nemanja
859abc8ec2 Blueprints (#31138)
* Blueprints

* Update tables_loot.yml

* doink

* mark as required

(cherry picked from commit 85b7d183bd9010feab003af1cef0980790d6cd7a)
2025-07-16 17:08:19 +10:00
SlamBamActionman
87c296ce28 Fix RGB toys color when worn/in-hand (#30023)
rgbeeeeeeee

(cherry picked from commit 4f479b6c85aec0b775062ece959b34f21171f211)
2025-07-15 16:35:48 +10:00
TsjipTsjip
135fd03078 Admin access configurator (#28107)
* Port spritework and initial prototypes by @Arimah

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>

* Make Admin PDA's spawn with a universal ID card

* Add universal access configurator to aghost satchel of holding

* Add Admin suffixes to adminonly items: AdminPDA, UniversalIDCard, AccessConfiguratorUniversal

* Admin jobicon

---------

Co-authored-by: Alice 'Arimah' Heurlin <30327355+arimah@users.noreply.github.com>

(cherry picked from commit daac3037835aba088c5c346e9e9d09d5e9402648)
2025-07-15 16:31:15 +10:00
IProduceWidgets
d4a13794ca add an arabian lamp. (#27270)
* add an arabian lamp

* yoink solutionitemstatus since it already displays fuel remaining.

* add comments

* fix containerception?

* Yeah sure, pray- I mean rubable.

* fix one flame frame

* Fixed emag behavior

* me when lexidysia.

* limit capacity of entitystorage and add some more comments about why it be the way it do.

* test fake?

* Holy fuck its a bug fix now? Based.

(cherry picked from commit ac53e1d0a07966c94195e69246b942be39b2b1b6)
2025-07-15 11:59:40 +10:00
Mangohydra
7edbbe6c0c The lawyer finally gets a stamp (#26012) 2025-07-15 11:59:39 +10:00
Ed
c5251bcc0c Recolor detective stamp (#25945)
* Add files via upload

* Update rubber_stamp.yml

(cherry picked from commit d3d9898d2acd7cbc14ca74835ba172497ff91efe)
2025-07-15 11:59:38 +10:00
Ilya246
2aac49a385 give nukie reinforcements full operative gear (#30173)
* rebase master

* free fish

* introduce recommended changes

* fix prototypes

* fix protos yet again

* fkhsdjbhehbo;ehb

* rafle

(cherry picked from commit d5236d8236d3638a4dcd54a4a219c4b9a44d34c4)
2025-07-15 11:58:08 +10:00
Moomoobeef
545936044f cargo can now order fax machines (#28968)
* cargo can now order fax machines

* removed fax manual

(cherry picked from commit adad6b2b0434416327337b57816dc412b97d4963)
2025-07-14 14:24:39 +10:00
Nemanja
01ebec354f Revamped Meteor Swarm (#28974) 2025-07-14 13:23:01 +10:00
Spatison
1eb01cb3cc fix crowbar sprite 2025-07-14 11:45:16 +10:00
Spatison
712a9cde25 resprites crowbar.rsi/cover-icon.png 2025-07-12 13:31:11 +10:00
Spatison
849afb5ff3 remove duplicate 2025-07-12 13:30:56 +10:00
Ubaser
e85df40fa8 Crowbar variants (#28988) 2025-07-12 13:29:32 +10:00
Flareguy
3ea6e95e80 Emergency toolbox fill rework (#29202)
* emergency toolbox fill rework

* Fuck

(cherry picked from commit 94995460fd0eec432b1a6468af47ad415063c6af)
2025-07-12 13:27:38 +10:00
Ko4ergaPunk
4db3a14dda Cutter machine & steel mozaic item tiles (#30431) 2025-07-12 13:27:24 +10:00
Nemanja
2b8f85e306 metal foam grenades (#29428)
* metal foam grenades

* wow okay

* meh

* bruh

* test

* push

(cherry picked from commit 21d0f85cc27823beda4cf4885f83f7452e468fb0)
2025-07-12 13:24:09 +10:00
Leon Friedrich
69ac7fcfc5 Fix dud modular grenade visuals (#28265)
(cherry picked from commit 4735cb7d2df3b54e7213913532a67f64be4ed606)
2025-07-12 13:22:44 +10:00
Nemanja
af1c5cda25 Salvage Spawners (#31020)
* treasure entities and spawners

* no more smiles

(cherry picked from commit c41fe93040ff9a63ba26a39c0c505fce35b02389)
2025-07-12 12:45:36 +10:00
Lumminal
3aaaac7c06 [PORT] Thief Beacon (#2447)
# Description

Ports thieving beacon.

PRs ported:
https://github.com/space-wizards/space-station-14/pull/29997
https://github.com/space-wizards/space-station-14/pull/34430
https://github.com/space-wizards/space-station-14/pull/33750
https://github.com/space-wizards/space-station-14/pull/32764

<!--
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/a25836d0-7d1c-47fb-b284-762e20ce1299



</p>
</details>

---

# Changelog

🆑 TheShuEd, sporkyz, ReeZer2, Alpha-Two
- add: Ported thieving beacon from wizden. Have fun stealing pets now!

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
Co-authored-by: John <35928781+sporkyz@users.noreply.github.com>
Co-authored-by: ReeZer2 <63300653+ReeZer2@users.noreply.github.com>
Co-authored-by: Alpha-Two <92269094+Alpha-Two@users.noreply.github.com>
2025-07-12 12:30:27 +10:00
Ed
6d27e6059c 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>

(cherry picked from commit f3a97fc0c53e0db2875d02839eb60599e53245e8)
2025-07-12 03:02:44 +10:00
Cojoke
61813c69d0 some wizmerge fix: part 2 2025-07-12 01:47:33 +10:00
Floofi
604cf0bd32 add lemon juice and fix bad sprite allocation (#27465)
(cherry picked from commit 3284c24ece7a972373f68ff0f600c9db9ffd181a)
2025-07-12 01:42:12 +10:00
PursuitInAshes
43b61bfaf3 Add sake bottle (#26776)
(cherry picked from commit 8adfa1918175a416e5b1833d7477a25fb7ff6c9b)
2025-07-12 01:42:11 +10:00
Spatison
bad6a07728 some wizmerge fix 2025-07-12 01:38:01 +10:00
themias
3b8b20c6d9 Add envelopes (#30298)
* Add envelopes

* oops

* Remove unused loc string

* comments and fixes

(cherry picked from commit 85e36266fa5d24dd742b050e2a64c0a68cdc66db)
2025-07-12 01:26:26 +10:00
Errant
ee039e426b Survival Box Loadouts, Nitrogen Emergency tanks (#29131) 2025-07-12 01:26:25 +10:00
Cojoke
e78a1aecf8 New Sprites for Tranq Shells + Add consistancy to printing Tranqs (#28903)
* New Sprites for Tranq

* Add consistancy to secfab print

(cherry picked from commit 865810c6e122cb2f4f8eb601c17bf9b84690f890)
2025-07-12 01:26:14 +10:00
lzk
cf6048975a Move pens out of paper.yml mess (#28044) 2025-07-12 01:23:06 +10:00
Gersoon
908e0ab9cd MakeRespriteGreatAgainPart1 (#644)
* UltraMegaCommit

* Fix1

* Fix2

* Fix3

* Update monotile_frame.yml

* Fix4

* Fix5
2025-06-28 11:30:19 +03:00
RedFoxIV
974dcc6071 Day of the dolly mixture (#509)
* i guess we doin' three dimensions now

* i guess we doin' cleanup now

* i guess we doin' final cleanup now

* I guess we doin' useless comments now

* i guess we doin' watermarking now

* I guess we doin' unfunny commit messages now

* I guess we doin' code review now

* I guess we (ain') doin' .vox parsing now
2025-05-25 00:54:06 +03:00
Timfa
061e5ecc4f Add East-Orion Company (#2359)
<!--
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

Adds the East-Orion Company as a selectable Employer.
The reason this company is being added is simple; there are a number of
employers spread out over the various jobs on the station. However,
there is no company yet that gave Hydroponics any attention.
With my Nederlandic nationality already hinting at farming and
agriculture, I decided that this might be something I could expand upon
to give Hydroponics some representation among megacorporations.

The East-Orion Company takes inspiration from various real-life sources.
The most obvious arethese:
New-Nederic, referencing New-Holland, a tractor manufacturer,
representing the Hydroponics side of the East-Orion Company
Farmer's Civil Union, referencing the BoerenBurgerBond, a political
party representing farmers across the Netherlands, who I used as
inspiration for the Security-side of the East-Orion Company.

The Hydroponics uniform uses colours taken from New-Holland tractors,
while the FCU security jumpsuits mimic the design of the police uniform
used in the Netherlands.

In addition, the East-Orion Company Botanists can select a new plant
clipper in their loadout. This functions the same as normal plant
clippers, except that they deal less damage to plants when taking a
sample from them.

---

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

![botany](https://github.com/user-attachments/assets/938c8cab-2043-4823-b7b0-1c21945856d1)

![clippers](https://github.com/user-attachments/assets/68b39cd7-a921-46bc-b144-96f6b54be051)

![clippers2](https://github.com/user-attachments/assets/0ac6bbc4-5da6-49de-a510-b7e833c9adef)

![employer](https://github.com/user-attachments/assets/b79988bc-c385-4bff-85f5-cd80e5381b9a)

![sec](https://github.com/user-attachments/assets/0f81bc49-fffb-4a45-8669-39a6b3ad975f)

</p>
</details>

---

# Changelog

🆑
- add: Added the East-Orion Company as a selectable Employer, focusing
on Hydroponics. They have alternate Hydroponics uniforms, alternate
Security uniforms, and a high-quality plant clipper that is more gentle
on plants when taking a sample.

---------

Signed-off-by: Timfa <timfalken@hotmail.com>
Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com>

(cherry picked from commit 24bb2ac123b74a9622c5bb5ff6eb2413423839d9)
2025-05-10 01:30:46 +03:00
Spatison
2a10c02eb5 No spead merge (#475)
* Revert "[GoobPort] WIZ REAL (#465)"

This reverts commit 091a8ff433.

* fix local
2025-04-26 10:50:32 +03:00
Spatison
ca698df4e5 [Tweak/Fix] Uplink (#470)
* >oOo<

* some fix and ru local

* fix rsi validator

* krolik umni
2025-04-26 10:20:00 +03:00
Kai5
091a8ff433 [GoobPort] WIZ REAL (#465)
* Уэээээээ

* Почти настрадались

* Скоро конец....

* СКОРО

* Мышки плакали, кололись, но продолжали упорно жрать кактус

* Все ближе!

* Это такой конец?

* Книжка говна

* фиксики

* ОНО ЖИВОЕ

* Телепорт

* разное

* Added byond

* ивенты теперь работают

* Разфикс телепорта

* Свет мой зеркальце скажи, да всю правду доложи - Я ль робастней всех на свете?

* Разное

* Еще многа всего

* Многа разнава

* Скоро конец....

* ЭТО КОНЕЦ

* Фикс линтера (ну, или я на это надеюсь)

* Еще один фикс линтера

* Победа!

* фиксики

* пу пу пу

* Фикс подмастерья

* Мисклик

* Высокочастотный меч

* Неймспейсы

* Пул способностей мага
2025-04-26 10:18:58 +03:00
Remuchi
1e363c7346 Revert "Merge pull request #462 from WWhiteDreamProject/revert-460-upstream"
This reverts commit 092dba42e5, reversing
changes made to e6315c2320.
2025-04-20 11:15:45 +07:00