Commit Graph

3437 Commits

Author SHA1 Message Date
IProduceWidgets ecec1e3093 Add explosive cord. (#25875) 2025-12-29 11:39:12 -06:00
Mora fcf455d5a2 fix out of bounds pixels on vox neck displacement map (#40495)
fix out of bounds pixels on vox displacement map
2025-12-29 11:39:12 -06:00
Keer-Sar 3f5a3e3c14 Add "Lizard Visage" Snout Markings to lizards (#35294)
* initial commit

* Update attribution in meta.json

* Fix yaml formating in meta.json
2025-12-29 11:39:12 -06:00
RedBookcase ac3ee45d83 Recharger tweaks. (#38138)
* Recharger tweaks.

* Remove note.

* Fix Potato blacklist.

---------

Co-authored-by: RedBookcase <Usualmoves@gmail.com>
2025-12-29 11:39:12 -06:00
chromiumboy d16c5ea8e3 Health increase for station AI cores (#40487)
* Initial commit

* Increased health further
2025-12-29 11:39:11 -06:00
Tiniest Shark 0b611537c0 Inhand Sprites for Clear Glass (#40427) 2025-12-29 11:39:10 -06:00
IProduceWidgets 31b865f08b The Experimental Lecter 8 (#40372)
* XL8 files

* slap dat on the ERT lead

* oop mag indicator offset

* fix newline
2025-12-29 11:39:10 -06:00
PicklOH 05b8e778d9 Adds Nukie IDs and PDAs, makes Nukie IDs able to copy accesses. (#37304)
* Adds Nukie IDs and PDAs, makes IDs able to copy access.

* Fixed PDA and ID parenting

* Meta.json spacing

* PDA parenting

* retest

* Forgot a comma OOPS

* Spacing

* Minor meff fix

---------

Co-authored-by: Princess Cheeseballs <66055347+Pronana@users.noreply.github.com>
2025-12-29 11:39:09 -06:00
SurrealShibe 159a1433e8 Turn the Satanic Bible's pentagram around, fix left inhand (#40234)
change sprites, update meta
2025-12-29 11:39:08 -06:00
chromiumboy be4a555ae3 The station AI can be destroyed (#39588)
* Initial commit

* Fixing merge conflict

* Merge conflict fixed

* Anchorable entities can now be marked as 'unanchorable'

* Revert "Anchorable entities can now be marked as 'unanchorable'"

This reverts commit 6a502e62a703cf06bd36ed3bdefe655fc074cfc5

This functionality will be made into a separate PR

* Error sprite

* Update AI core appearance with sustained damage, spawn scrap on destroyed

* Added intellicard sprite

* AI damage overlays

* Added fixtures

* AI core accent changes when damaged or low on power

* Bug fix and pop up messages for inserting AIs into inoperable cores

* Updated 'dead' sprite

* Destroying the AI core reduces the number of AI job slots available

* AI battery duration set to 10 minutes

* Initial commit

* Allow MMIs used in the construction of AI cores to take them over

* Initial resources commit

* Initial code commit

* Sprite update

* Bug fixes and updates

* Basic console UI

* Code refactor

* Added lock screen

* Added all outstanding UI features

* Added purge sprites

* Better appearance handling

* Fixed issue with purge sprite

* Finalized UI design

* Major components finalized

* Bit of clean up

* Removed some code that was used for testing

* Tweaked some text

* Removed extra space

* Added the circuitboard to the RD's locker

* Addressed reviewer comments plus tweaks

* Addressed reviewer comments plus tweaks

* Removed instances of granular damage

* Various improvements

* Removed testing code

* Fixed issue with disabled buttons

* Finalized code

* Addressed review comments

* Added a spare Station AI core electronics to the research director's locker

* Fixing build failure

* Addressed review comments

* Addressed review comments

* Added reverse path for construction graph

* Removed unneeded reference

* Parts can be purchased through cargo

* Fixing merge conflict

* Merge conflict resolved

* Fixing merge conflict

* Code update

* Code updates

* Increased AI core health and gave it a sell price to fix test fail

* Added screen static sprite

* Added better support for ghosted AI players plus code tweaks

* Various improvements and clean up

* Increased purge duration to 60 seconds

* Fixed needless complication

* Addressed reviewer comments part 1

* Addressed reviewer comments part 2

* Further fixes

* Trying lower battery values to see if it fixes the test fail

* Adjusted power values again

* Addressed review comments

* Addressed review comments

* Fixed test fail

* Fixed bug with endless rebooting. Using rejuvenation on an AI core revives the AI inside.

* Added pop up text

* Bug fix

* Tweaks and fixes

* Fixed restoration console not updating when the AI finishes rebooting

* Update SharedStationAiSystem.Held.cs

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-12-29 11:39:07 -06:00
SharkSnake98 5cb862522c Dark/Light Grass & Desert Astrotiles (#37867)
* Added Waterjug, a low-mid pop map with a tropical theme and custom evac shuttle

* Fixed postmapinittest issues (Hopefully)

* Actually fixed the afformentioned issue.

* Added Warden Spawnpoint which I forgot

* Named APCs, Substations, & Cameras, added some more decals

* Decorated some more, notably the bar.

* Minor adjustments, added cans, slightly reworked salv and maints bar

* Fixed some small issues, notably weird closed doors, added a few small things (shutters mostly)

* Added 2 new astrotiles, dark grass and desert sand.

* Removed map. Fixing issue. Please hold.

* Forgot to remove a comma, please god forgive me maptainers. I blame Rider IDE for it's autoaddition of all changes made even on seperate branches.

* Added localization for stacks.

* Actually fixed the loc. issue. Maybe. Please.

* Hopefully fixed the last localization issue.

* Added Light Astro-tiles, and edited the names of the inhand png's for the dark grass astrotiles to be more internally consistant

* Fixed some issues caused by another PR I made, added more maints stuff

* Made some small decorative and practical changes

* Fixed, changed, and added a ton of stuff. I don't think I can list it all, honestly.

* Removed shields to try to fix an issue with the test

* Hopefully fixed issues relating to a failed test.

* Replaced grass/flora decals with randomized ones, readded shields to armory

* Fixed some YML issues, whitelisted files for flora decal spawners

* Added a bridge-beach, added some misc. items and objects.

* Small changes to buttons, fixed wires and flooring

* Fixed AME-Holopad issue.

* Added a Custom Waterjug Parallax, made it so the parallaxes actually work, and made some minor adjustments to the map

* Fixed an accidental adjustment to CoreStation's parallax prototype YML

* Changed some Salvage and Cargo stuff

* Fixed some merge issues, updated Adriatic with a locker and added some little details to Waterjug

* Fixed some stuff, added docking arm near evac

* meta json fix tiles

* fixed again

* fixed once more

* Removed all the waterjug stuff.

* fix spacing

* fix unnecessary formatting

---------

Co-authored-by: SharkSnake98 <sharksnake87@gmail.com>
Co-authored-by: ArtisticRoomba <145879011+ArtisticRoomba@users.noreply.github.com>
2025-12-29 11:39:07 -06:00
SlamBamActionman ab9a97e87d Reorganize and refactor drinks yml (#39221) 2025-12-29 11:39:06 -06:00
Lillian Industries 59d925efce Added SmartFridge circuitboards (#39879) 2025-12-29 11:39:05 -06:00
IProduceWidgets b315cd2ee4 No take; Only throw. (#40143)
* commit atrocities

* hail satan

* Channel Pavlovian horror

* pet kitty cat

* Taint universe forever

* Assault sensibilities

* sully existence

* tarnish morality

* The degunnening

* encratening

* Update toys.yml

* add few pixels to fix vulp inhands

---------

Co-authored-by: ScarKy0 <scarky0@onet.eu>
2025-12-29 11:39:05 -06:00
GeneralGaws 5f553c8b37 Fix darts inhand sprites (#40207)
fix

Co-authored-by: GeneralGaws <limonmessi@mail.ru>
2025-12-29 11:39:05 -06:00
Quantum-cross 20e1de2376 Dynamic anomaly scanner texture (#37585) 2025-12-29 11:39:00 -06:00
Milon 4e62806b45
fix vulp helmet sprites for paramed, CE and engineer (#5038)
fixes!
2025-12-28 17:51:01 +00:00
Halo3moth a67f32773b
Adjutant Rekitting (#5014)
* THANK GOD THIS IS ALL IN _DV

Adjutant changes

* Forgot to use my full discord user for the metajason

:3c

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* 1.3 to 1.5

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
2025-12-27 07:26:51 -06:00
This_Is_Gray fa77b25204
Epistemics EVA Suit (#4908)
* engi and epi suits

* feroxi helmet updates

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fuck

* remove engi suit, pending work from Astra

Co-Authored-By: Astra <226853568+EmberAstra@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update softsuits.yml

* Update eva-helmets.yml

* helmet nerf

* Update Resources/Textures/_DV/Clothing/Head/Helmets/eva_epistemics.rsi/meta.json

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

* Update Resources/Textures/_DV/Clothing/OuterClothing/Suits/eva_epistemics.rsi/meta.json

Co-authored-by: Charlie Morley <cmorley191@gmail.com>
Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>

* Update eva-helmets.yml

* Update science.yml

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Signed-off-by: This_Is_Gray <167829864+IAmNotGray@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Astra <226853568+EmberAstra@users.noreply.github.com>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
2025-12-20 17:35:52 -07:00
Halo3moth 2cca8da7dc
New(ish) evil borg to uplink (sabotuer) (#4919)
* Saboteur Borg

Adds Saboteur Borg

* Oopsies

fixed a oopsies deleted line

* That should be the final change?

Description clean up and small bugs found

* Direction changes part1

Most the direction changes but I missed something

* Direction changes part 2

:3c

* Updated saboteur borg to use a cloaking module, similar to the xenoborg's cloaking module

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed parent

* One more time

---------

Co-authored-by: Vanessa <vanessalouwagie@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-19 17:13:31 -06:00
verybigman 6d3655aed0
Security borg action icons, Syndicate borg action icons, and Syndicate module sprites (#4920)
* hypo changed

* sprites put into rsi's

* json updated

* actions done

* mane

* fix

* fix

* updated parents

* wow

* escalation edit

* wan last fix
2025-12-18 21:04:15 -06:00
Velcroboy 75fbb95ace
Adds Christmas Kobolds: Defenders of The Yule Tree (#4940)
* Adds Christmas Kobolds: Defenders of The Yule Tree

* update comments

* Add candy spear sprite

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* no shoes for now

* Revert "no shoes for now"

This reverts commit 8bece94b57.

* No shoes for now

* maybe

* Ain't

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-18 20:33:03 +01:00
verybigman fe544932a6
Working Musket Bayonet, Musket Tweaks, and Pipe Sounds. (#4852)
* musket complete

* done

* added comment

* tada

* changed!

* fix

* fix

* migration thing

* test

* fixed comments
2025-12-17 07:51:49 -06:00
Averi c454503bfb
Festive lights now fit around your body (#4972)
* add sprites and YML + JSON changes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Update theater.yml

* Update Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Signed-off-by: Averi <AveriV1@protonmail.com>

* Update Resources/Prototypes/Catalog/VendingMachines/Inventories/theater.yml

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Update cargo_vending.yml

---------

Signed-off-by: Averi <AveriV1@protonmail.com>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2025-12-16 20:15:09 +01:00
Velcroboy 0bfb5cd451
Detective and Library Signs (#4943)
* Update signs with DV color schemes
	new file:   Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/detective.png
	new file:   Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/library.png
	modified:   Resources/Prototypes/Entities/Structures/Wallmounts/Signs/signs.yml
	modified:   Resources/Textures/_DV/Structures/Wallmounts/signs.rsi/meta.json

* other files

* library
2025-12-12 22:24:48 +01:00
AeraAulin b9843fa450
Purifying salts (#4682)
* healing

* aaaaaaa

* i'm too tired for this

* Update Resources/Prototypes/_DV/Stacks/medical_stacks.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* Update Resources/Prototypes/_DV/Entities/Objects/Specific/Medical/healing.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* thing

* tired feverish webedit

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>

* comment change to retrigger CI

Signed-off-by: Charlie Morley <cmorley191@gmail.com>

---------

Signed-off-by: AeraAulin <133451603+AeraAuling@users.noreply.github.com>
Signed-off-by: Charlie Morley <cmorley191@gmail.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Charlie Morley <cmorley191@gmail.com>
2025-12-11 15:39:23 -07:00
Stxcking f70b80e88a
Add more festive holiday clothing to AutoDrobe (#4909)
* sprites galore

* no Santa monkey

* autodrobe

* cost up
2025-12-10 08:05:32 +00:00
Vanessa e945f5869a
Harpies Flightless No More! (#4888)
* Initial port of EE Harpy flying (#919)

* Added better friction and acceleration modifiers.

* Moved server's flight system to shared. I don't know why it isn't in the first place.

* Shifting things around.

* Code tweaks to make it better

* Comment fixes

* Fixed footsteps and footstep sounds

* Added a quick conditional if InitialStaminaCost greater than zero

* Removed a pop-up that wasn't showing

* Additional adjustments

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixed a few more systems to call the Flying system instead of the component

* Comment consistency. DeltaV comments where I made it better. EE comments where they originally had things

* YAML fixes

* Guidebook

* Apply suggestions from code review

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>

* Removed DoAfterDashEvent

* Fixed suggestions

* Updated comment

* Added new copyright free wingflaps with proper attribution

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Appeased YAML gods

---------

Signed-off-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-12-08 14:58:52 +01:00
verybigman d287951f1e
Reinforced Tinted Windows (#4875)
* completion

* fix

* moved directories

* fixed

* Apply suggestion from @Toby222

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

---------

Signed-off-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-12-08 10:01:15 +01:00
Stxcking 4a9a9f4be5
Add Chemical, Paramedic, and Surgeon wall lockers (#4899)
* woo wall lockers!

* chemical

* clean up

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-07 18:54:34 +01:00
Vanessa 3c0fa71f86
Holofan Rebalance (and Standardizing Holoprojectors) (#4734)
* Holofan re-balance. No longer infinite but recharge.

Original Implementation by MajorMoth. Modified and expanded on by ShepardToTheStars. Holofans Changes (#1394)

<!-- 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 -->
<!-- What did you change? -->
- Holofans are now timed
- Holobarriers are now charge based, and produce a timed barrier

<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
Direction request to avoid them being up all shift and doing atmos
shenanigans.

<!-- Summary of code changes for easier review. -->
New components and systems to handle detailed descriptions on holofan
barriers. Bunch of .yml changes.

Because both holograms can now either be destroyed, or despawn after 5
minutes, a complete rewrite of the way they're produced was necessary.
The projectors still have 6 uses and can recharge 1 use every 2 minutes.
Clicking on a holo barrier/fan with the correct projector will delete
it, and add a charge back to the projector.

<!-- 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. -->
N/A

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

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

🆑 Jakumba
- add: Added a warning text when inspecting a Holofan and Holobarrier
with duration before they expire
- tweak: Holobarrier Projectors now work on a charge base system
- tweak: Holofans and Holobarriers now last for five minutes when placed

---------

Co-authored-by: Falcon <falcon@zigtag.dev>
Co-authored by: Vanessa <vanessalouwagie@gmail.com>

* Added a CanPickup variable to the component to disallow picking up holoprojections.

* Hid the empty version of HoloprojectorEngineering

* YAML cleanup

* Holoprojection locale update

* Old logic cleanup

* Fixed holobarrier sprite

* Words

* Fixed hidden projector in DV namespace

* Excluded TimedDespawnDetailed from test that already excluded the TimedDespawn comp

* PR #4734 feedback changes

* oops. Actually put StopTimer in TimedDespawnDetailed

---------

Co-authored-by: Jakumba <16194688+Jakumba@users.noreply.github.com>
Co-authored-by: Falcon <falcon@zigtag.dev>
2025-12-05 12:56:09 +00:00
Stxcking 4c1ffd2cee
Fishing Vendor and Fish Basket (#4862)
* everything rah

* vending.png

* recovered files

* clean up

* .

* final touches?

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-04 20:58:57 -06:00
Stxcking c12e669b14
Add prescription glasses to loadouts + diagnostic hud (#4871)
* everything buh

* a bunch of loadout changes

* .rsi

* changes request + prisonguard startinggear
2025-12-04 20:14:00 -06:00
verybigman 0f1a7f69e8
Ultimate Wielded Sprites Update (and other fun things) (#4851)
* lasers done

* fixed drinks

* one done

* enforcer complete

* messed up the sprites

* fixed suitstorage

* edit

* electric boogaloo

* save

* IK done

* guess who forgot to edit the json

* every gun now has wield sprites

* kammerer is BROKEN

* finally free

* changes
2025-12-04 12:42:20 -06:00
KOTOB 73363b9ff5
More Chat Indicators (#4679)
* emote whisper and OOC bubbles

Signed-off-by: Nesoryo-jpeg <joem365289@gmail.com>

* Update meta.json

added entries for OOC, Emote, and Whisper

Signed-off-by: Nesoryo-jpeg <joem365289@gmail.com>

* Update meta.json

added copyright info for OOC, Emote, and Whispering

Signed-off-by: Nesoryo-jpeg <joem365289@gmail.com>

* Update typing_indicator.yml

Added Whisper, OOC, and Emote indicators

Signed-off-by: Nesoryo-jpeg <joem365289@gmail.com>

* added indicator logic

* added radio sprite state

* initialized logic for chat bubbles

* refresh indicator change

* fixed emote sprite

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* nicer comments

* cleaned up and sorted namespaces

* oh my god

* cleanup...

* cleanup two

* cleanup 3 (my god)

* YESSSS

---------

Signed-off-by: Nesoryo-jpeg <joem365289@gmail.com>
Co-authored-by: Nesoryo-jpeg <joem365289@gmail.com>
Co-authored-by: nkokic <nikola1.kokic@gmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-04 10:59:08 -06:00
Dorragon 36025fe065
There's always bigger fish in the sea (#4826)
* Oh my god there are sharks here

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* I don't even know man

* Fix spaces

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* fixes fixes fixes

* English language was invented to sell more dictionaries

* eveny

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-04 14:27:57 +01:00
verybigman dae3e5fe26
Christmas Lamp Rotation Fix (#4865)
lampfixed
2025-12-03 21:26:40 -06:00
Stxcking 60928a137b
Syndicat Returns (#4731)
* meow

* whoops

* meta,json

* forgot

* i cant spell sobs

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* resolved conflict

* Revert "resolved conflict"

This reverts commit 3fcf22b163.

* Update plastic.yml

* Update plastic.yml

* Update plastic.yml

* Update plastic.yml

* Update plastic.yml

* Update plastic.yml

* changes request

---------

Signed-off-by: Stxcking <tamthaotran5@outlook.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-02 23:32:01 -06:00
Sir Warock 5914ff6e44
Make the Adv. Truncheon Advanced (#4736) 2025-11-30 10:46:38 -06:00
verybigman 4159ed8d7c
New Decoration: The nefarious Lava Fountain (#4792)
* work in progress

* bugs all gone!

* cough

* we are finally done or something

* sprite fixed
2025-11-30 10:44:24 -06:00
verybigman 4f2f881f35
Various beverage additions, tweaks, and modifications. (#4780)
* minor additions complete

* Added a bunch of fun thingies

* yet another commit

* finally free

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* oops

* minor sprite issue fix award or something

* changes complete to comments and credits

* forgot to do this

* last minute sprite fixes

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-11-30 10:41:31 -06:00
Vape ed9560c92f
OVINIA INVASION !! (#4715)
* Ovinia Species (Straight Sheepin It) DRAFT (#490)

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

Yeah yeah yeah im sheeping my shit im straight sheeping it yeah yeah
yeah.
I'm literally making the Ovinia species, sheeps in space. oh god oh fuck
i hope i get this done.

Ovinia are basically sheep but in space! Pretty freaking cool!

Traits:
Pros:
wont trigger shards/mousetraps on step,
cold/heat threshhold resist (wool),
get hungry/thirsty 25% slower,
flammibility 75% (wool),
Take 20% less cold, shock, and heat damage (wool),

Cons:
theobromine weakness,
sleep 50% longer, (to be coded)
eat 20% slower,
take 15% more pierce/slash

---

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

- [x] Get Base Sprites in for body/tail/ears
- [x] Make Species Prototype
- [x] Make Markings Prototype
- [x] Make Body Parts Prototype
- [x] Make Entity Body Prototype
- [x] Make sure Entity Body Prototype is done right
- [x] Make Organ Prototype
- [x] Make Entity Species Prototype
- [x] Make sure Entity Species Prototype is done right
- [x] Add markings/finish Prototype
- [x] Make Sounds Prototype
- [x] Add Sounds
- [x] Make sure Baas is an emote and works
- [x] Make Mobs Player
- [x] Make sure Mobs Player Prototype is done right
- [x] Make Language Prototype
- [x] Add Displacement maps for clothing
- [x] Add swag
- [x] Add traits
- [ ] Add ovinia outerwear variants (can do later)
---

<!--
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/b000389d-55f3-4de7-84d8-058f7fa1832b)

![image](https://github.com/user-attachments/assets/ea7ca855-edc8-42a0-9a36-941ccac403a7)

![image](https://github.com/user-attachments/assets/ca0c919d-214c-4ca7-bb30-a62c009588bb)

![image](https://github.com/user-attachments/assets/7e19d12d-3e1d-41a0-992b-1785f5ea2215)

![image](https://github.com/user-attachments/assets/f08210b1-5f02-4e6f-8d46-5018fc8a918b)

![image](https://github.com/user-attachments/assets/88848e52-eb54-44dc-ad0e-bcdc7d756078)

</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: Added Ovinia as a playable species!
- tweak: Moved some localization to Den specific areas
- remove: Removed all of the snacks out of gregg's cupboard

---------

Co-authored-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
Co-authored-by: Rosycup <178287475+Rosycup@users.noreply.github.com>

* Sum Horns (#911)

<!-- 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.-->
<!-- What did you change? -->
This adds four new horns for Ovinia. And a snout, too. 🫡
It's MIT because I want it to be, and in case anyone needs horns for
species that are like. That high up in orientation.
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
Ovinia don't have enough horns. Ovinia also doesn't have a marking that
puts a line through the top of your face. So I fixed that in this PR.

<!-- Summary of code changes for easier review. -->
A meta JSON, an FTL file, and a bunch of images.
<!-- 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. -->
Just look in files changed.
<!-- 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 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 -->

**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. -->
🆑
- add: Gave ovinia a little bit more horn, and a secret snout.
<!--
🆑
- add: Added fun!
- remove: Removed fun!
- tweak: Changed fun!
- fix: Fixed fun!
-->

---------

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

* Ovinia Trait Fix and Emote Adjustments (#1124)

<!-- 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 -->
Fixed the localisation of the Baa emote. Changed Baa and Moo from the
caw icon to relevant animal icons both taken from
[[TGstation](https://github.com/tgstation/tgstation)] and modified
slightly. Fixes the ovinia trait not conferring the relevant emotes when
chosen. Fixes #775.

Fixed missing location for Baa emote.
Added relevant _Den namespace folders and attribution file for emotes.
Added two new icons to said folders.
Removed ´available: false´ from ovinia speech_emotes.yml making the
trait work as intended.

<img width="153" height="114" alt="imagen"
src="https://github.com/user-attachments/assets/2530e067-dccc-41e7-b36b-9be5594761c9"
/>

- [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.

**Changelog**
🆑 Wheels
- add: New icons for Baa and Moo emotes
- fix: Ovinia sounds trait will now allow holders to Baa as intended
- fix: Baa emote name will name display properly when hovered over

---------

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

* Ovinia Typing Sprite Fix (#1348)

<!-- 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 -->
<!-- What did you change? -->
routed ovinia's non typing state to work
<!-- Discuss how this would affect game balance or explain why it was
changed. Link any relevant discussions or issues. -->
fixes massive error when thinkibng waht to type
<!-- Summary of code changes for easier review. -->
ough
<!-- 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. -->
<img width="139" height="137" alt="image"
src="https://github.com/user-attachments/assets/25990a20-0782-46a2-b0c5-fb6f3374d7c4"
/>

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

**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. -->

🆑
- fix: Fixed Ovinia's idle typing sprite to not be a massive error

* continuing to go bald

* Fixing Fails with the language FTL

* Changes again to languages.ftl

* Removed Resomi Stuff from the FTL

* Fixed the language thingy once more

* Grammar and fixes

* Ovinia DeltaV adjustments

* Added AnimalFriend faction

* Switched Ovinia naming scheme to default

* Fixed YAMLLinter issues with Ovinia

* Fixed the heat damage thingy

* YAML Linter Hates me

* Testing Changes

* Update ovinia.yml

* Update ovinia.yml

* FINALLY

* Updates to Factions for the AnimalFriend Trait

* Fucking Case Sensitive

* Reviewed proposed changes to Ovinia.yml

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>

* Updates

Fixed all requests besides the displacement maps. Still workin on that

* Fixes Coscult and Displacements

* misc

* Tag fixes. YAML Linter, my beloathed

* random grumbles

case sensitivity is set to high. please fix this maintainers, thanks

* BREAKTHROUGH

* Req changes

* Attributions, and New soundies

* Updaties

---------

Signed-off-by: Vape <76235372+Vapetastic-Gaming@users.noreply.github.com>
Co-authored-by: juniwoofs <jakbroeder@gmail.com>
Co-authored-by: Blitz <73762869+BlitzTheSquishy@users.noreply.github.com>
Co-authored-by: Rosycup <178287475+Rosycup@users.noreply.github.com>
Co-authored-by: Mono <182929384+Monotheonist@users.noreply.github.com>
Co-authored-by: TheDen-Bot <186991657+TheDen-Bot@users.noreply.github.com>
Co-authored-by: wheelwrightt <174839295+wheelwrightt@users.noreply.github.com>
Co-authored-by: sheepie <180479595+juniwoofs@users.noreply.github.com>
Co-authored-by: Vanessa Louwagie <vanessalouwagie@outlook.com>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
2025-11-28 08:17:45 +01:00
Vanessa 1a25841fb8
Cargo Mascot Updates (#4769)
Direction requested changes
2025-11-26 23:08:22 -06:00
Exile152 9e2275f359
Add Cargo Mascot Clothing (#4708)
* Merged mascot clothing from omu

* fixed conflicts

* fixed more newbie errors

---------

Co-authored-by: thetuerk <46725294+ThanosDeGraf@users.noreply.github.com>
2025-11-26 10:23:20 -06:00
Stop-Signs e7714f1d63
fix lobby art (#4762)
yes
2025-11-26 14:44:21 +01:00
Sir Warock 09cbcd71cb
Add the NT-3 (#4622)
* Add Bipod System

* Add the NT-3

* Small fixes

* Small fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix Test Fails

* Small oversight

* Robust the Code

* Fix Action Name

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix Action Description

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add WallPierce + Changes

* Small fix

* Cleanup

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix Testfail + Add Descriptions

---------

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2025-11-25 18:03:33 +00:00
Sir Warock b1303c94f1
Adding CentComm Chads Magazine (#4631)
* CentComm Chads

* Added to Migrations

* Typo Fix

* Different stamp

* Fix for maints
2025-11-24 13:47:47 +00:00
Tiniest Shark 5828a77370 Helm + Mask Displacements for Reptilians (and some unique helmets) (#39351)
* Liz displacements + unique helms

* small fix

* Couple of small fixes
2025-11-23 15:22:34 -06:00
Tiniest Shark 2a2ae8042c Add inhand sprites to Cartons and Cups, give new inhands to Cans. (#39814)
* Added inhand sprites to cans, cartons and cups.

* small tweak
2025-11-23 15:22:34 -06:00
Tiniest Shark 3e1d74b1f3 Burger Inhands (#39894)
burger is in your hands
2025-11-23 15:22:34 -06:00