Commit Graph

9 Commits

Author SHA1 Message Date
Vanessa 49cb073873 Fixed Devil errors after rebasing. 2025-11-23 15:22:35 -06:00
Vanessa 7acebd855a Goobstation Bluespace Lifeline migration to the new Trigger system 2025-11-23 15:22:15 -06:00
William Lemon f563f2c566
Ports Devils from Goobstation (#4639)
* or your debil

* Woop

* Whoops, Missed this

* Whoops, Suicide System

* Hush... Extended tests... Hush

* AAAAAA

* No-longer jaunt whilst dead

* :)

* Update Content.Shared/_Lavaland/Chasm/PreventChasmFallingSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: William Lemon <William.Lemon2@gmail.com>

* Update Content.Server/_Goobstation/Possession/PossessionSystem.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: William Lemon <William.Lemon2@gmail.com>

* Please tobysenpai forgive me

---------

Signed-off-by: William Lemon <William.Lemon2@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-11-20 10:11:07 +01:00
Apachito ff01033eaa
Port Fishing from Goob (#4615)
* FISHING REAL

* Update fishingspots.yml

* Delete fishingspots.yml

* Create fishingspots.yml

Removed the component that was causing errors

* Update Content.Client/_Goobstation/Fishing/Overlays/FishingOverlay.cs

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Structures/Furniture/toilet.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Tiles/lava.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Tiles/liquid_plasma.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Tiles/liquid_plasma.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Tiles/water.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_Goobstation/Recipes/Construction/Graphs/misc/makeshift_rod.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/Entities/Tiles/water.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_Goobstation/Actions/fishing.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Update Resources/Prototypes/_Goobstation/Catalog/Fills/Crates/service.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>

* Changed the name spaces

* Update SharedFishingSystem.cs

* Revert "Update SharedFishingSystem.cs"

This reverts commit 78451cd5c2.

* Update FishingOverlay.cs

* Update FishingOverlay.cs

* Revert "Changed the name spaces"

This reverts commit 50bac6c4be.

* Revert "Changed the name spaces"

* Fixed name spaces and the sprite system

* Update makeshift_rod.yml

* Update makeshift_rod.yml

* Update Content.Client/_Goobstation/Fishing/Overlays/FishingOverlay.cs

Signed-off-by: Tobias Berger <toby@tobot.dev>

* Update Content.Client/_Goobstation/Fishing/Overlays/FishingOverlay.cs

Signed-off-by: Tobias Berger <toby@tobot.dev>

* Fixed Name Spaced

Changed the names spaces and did the ones I forgot to do initially.

* Changed name spaces again

* Fixed name spaces real

* Update SharedFishingSystem.cs

* Update SharedFishingSystem.cs

* Update SharedFishingSystem.cs

* Update FishingSystem.cs

* Update FishingSystem.cs

---------

Signed-off-by: Apachito <ivanlopezlegos2004@gmail.com>
Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-11-18 22:06:59 +01:00
Vanessa 0deeaf7b77
Better Admin Tooling and New Curator Toys (#4577)
* Add Pockets and Tail-Drag to Admin Ghosts (#1508)

Adds 4 pockets to the Admin Ghosts and the ability to Tail-Drag (no
hands needed).

---

https://github.com/user-attachments/assets/701b66bd-c42c-429f-a33a-f8e465ef068d

---

🆑
ADMIN:
- add: Added pockets to Admin Ghosts.
- add: Added tail-drag (no-hands) to Admin Ghosts.

* Adding Admin Tools and Changing Aghost Starting Gear (#855)

- Added the admin folder, which can hold up to any normal item.
Prefilled with paper and a tasty treat.
- Added the admin toolbelt, which can hold up to any normal item.
Prefilled with various tools.
- Changed the admin satchel to be removable and added a few things to
its fill.
- Added the Admin RCD, an infinite RCD.
- Added an admin material box which contains 6 of the most basic
materials.
- The ID card in the admin PDA is now a CC ID card.

People were complaining about a lack of basic tools on the aghost.

Simple yml changes.

![image](https://github.com/user-attachments/assets/a65b145b-41d8-41e8-b48f-0ed567febe29)

- [x] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [x] I have added media to this PR or it does not require an ingame
showcase.
- [x] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.

None afaik.

**Changelog**
🆑
- add: A bunch of new admin tools and things in the aghost starting
gear.

---------

Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>

* Removed admin folder because it was being weird when put into containers and I don't really want fix it.

* Added auto-color for aghosts

* Added suffix to the CentComm implanter

* BSO Lifeline Port (#1730)

BSO lifeline implant - ported from Goobstation.

What is it?: It's a bluespace implant. Triggers when you die or when you
click the button twice.

Why is it?: BSO is a special role, specifically employed by CC. They
exist on station only to protect to command and nothing else. They have
pretty strong armour and weapons. So this is the solution to that +
creates an RP narrative.

It spawns in the BSO's pocket, as it's an optional implant, should
probably be taken either start of shift or when things get dicey for
command.

Additional: Adds new sprites for CC specified implants.

---

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

![Content
Client_MHAiLxtLug](https://github.com/user-attachments/assets/907b8a0b-98af-4a1c-855b-e1737a373e0d)

</p>
</details>

---

🆑
- add: Blueshield Officer lifeline implanter

---------

Signed-off-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>

* Fixed admin ghost color issue.

* Re-ordered the CentDrobe so useful things are at the top.

* Changed the sprite of the CentComm mindshield to match that of the Bluespace Lifeline.

* Added the ability to select a job with the 'spawncharacter' admin command.

* Added spawnplayer admin command

* Client-Side Entity Log Sorting (#1624)

<!-- Guidelines:
https://docs.spacestation14.io/en/getting-started/pr-guideline -->
<!-- NOTE: All code submitted to this repository is ALWAYS licensed
under the AGPL-3.0-or-later license.
The REUSE Specification headers or separate .license files indicate a
secondary license (e.g., MPL or MIT) solely to facilitate
integration for projects that do not use the AGPL license. This
secondary license does not replace the fact that AGPL-3.0-or-later
remains the primary and binding license.
Uncomment and modify the following line if you wish to change the
license from the default of AGPL.-->
<!--- LICENSE: AGPL -->
## About the PR
<!-- What did you change? -->
Expanded on admin log sorting. Fixes the issues from #1569

## Why / Balance
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
Admin things.

## Technical details
<!-- Summary of code changes for easier review. -->

## Media
<!-- Attach media if the PR makes ingame changes (clothing, items,
features, etc).
Small fixes/refactors are exempt. Media may be used in SS14 progress
reports with credit. -->


https://github.com/user-attachments/assets/837d9e4e-09bb-44ac-b79f-59435edc3aed


## Requirements
<!-- Confirm the following by placing an X in the brackets [X]: -->
- [x] I have read and am following the [Pull Request and Changelog
Guidelines](https://docs.spacestation14.com/en/general-development/codebase-info/pull-request-guidelines.html).
- [x] I have added media to this PR or it does not require an ingame
showcase.
- [x] I have tested any changes or additions.
- [x] I can confirm this PR contains no AI-generated content, and did
not use any AI-generated content.
<!-- You should understand that not following the above may get your PR
closed at maintainer’s discretion -->

## Breaking changes
<!-- List any breaking changes, including namespaces, public
class/method/field changes, prototype renames; and provide instructions
for fixing them.
This will be posted in #codebase-changes. -->

**Changelog**
<!-- Add a Changelog entry to make players aware of new features or
changes that could affect gameplay.
Make sure to read the guidelines and take this Changelog template out of
the comment block in order for it to show up.
Changelog must have a 🆑 symbol, so the bot recognizes the changes and
adds them to the game's changelog. -->
🆑
- tweak: ADMIN: You can sort entity logs by pressing fancy buttons!

* Fixed YAML linting issues

* Moved bluespace lifeline textures to proper directory

* Added emergency medical pods from Frontier for admemes.

* appeased the unit test gods

* Another test fail because people forgot that you can't divide by zero.

* probably appeased the unit test gods this time

* PR #4577 Feedback

---------

Signed-off-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: John Willis <143434770+CerberusWolfie@users.noreply.github.com>
Co-authored-by: MajorMoth <61519600+MajorMoth@users.noreply.github.com>
Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>
Co-authored-by: Rouge2t7 <81053047+Sarahon@users.noreply.github.com>
Co-authored-by: William Lemon <William.Lemon2@gmail.com>
2025-10-30 01:52:30 +00:00
Charlie Morley 223b81ea35
Bugfix microwaves staying locked out after cooking finishes (#4352)
* fix microwaves staying locked out after cooking finishes (issue 4201)

upstream issue (goob is where the breaking changes came from): https://github.com/Goob-Station/Goob-Station/issues/4086

* minor style fixes
2025-09-09 05:54:09 +00:00
AlgisAlphonse f7db03182a
Port goobstation factorio (#4035)
* Initial port of goobstation factorio, missing disposals integration and faxing. Also ports impstations modification for robotic arms to have static power draw. Also adds automation slots to silos and advanced microwave.

* Ports goobstation factorio fax automation, adds to the guidebook entry info about gas canisters.

* Ported Goob Disposals. Removed part about taking
mats out of storage silo cuz it ain't implemented
yet. Seems to work.

* Adds constructor circuitboard to research cuz I
forgor
2025-07-27 13:31:36 +01:00
Spielern 4cc1d06205 replaces fire damage with overheating code 2025-01-25 18:59:33 -05:00
hivehum 01a9e61ce9
Animated Emotes from Impstation (#2746)
* when the emotes are animated

* hopefully untouched

* INCORRECT

* can this work.

* flipping out
2025-01-18 23:50:21 +00:00