28 Commits
Author SHA1 Message Date
AlexisandMaia 1480078938 Additional upstream fixes 2026-08-14 19:42:37 +02:00
7b6960af81 Adds gloryhole portals and stuck in wall content. (#3713)
## About The Pull Request

Adds the LustWish portal bore to the vendor, an item that allows you to
connect two locations via a portal that can act either as a gloryhole or
a route for stuck in wall content. These portals allow for remote scenes
using subtler or interact menu verbs.



![Portal2](https://github.com/user-attachments/assets/4606c8f3-1d77-4354-9f50-65bcca2e8103)

![Portal1V2](https://github.com/user-attachments/assets/4d62a217-bfa3-4f6a-8136-85fdacf2ac85)
## Why It's Good For The Game

I've heard requests for both portal play and gloryhole content, this
scratches both itches sufficiently in my opinion
## Proof Of Testing
<details>
<summary>
Screenshots/Videos</summary>

Both modes pictured


![Portal3V2](https://github.com/user-attachments/assets/93d33cb5-8bd4-49a0-99e5-cc5b2574bbb0)

</details>

## Changelog
🆑
add: The Lustwish Portal Bore has been added, equipped with both a
gloryhole and stuck in wall mode, your lower half can now be in dorms
while your head performs your job
/🆑

---------

Co-authored-by: lessthanthree <83487515+lessthnthree@users.noreply.github.com>
Co-authored-by: Roxy <75404941+TealSeer@users.noreply.github.com>
Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
2025-06-30 00:30:55 +03:00
Roxy e5482d60b9 fixes for #90858 2025-05-08 19:29:49 -04:00
Majkl-J 2e25ad3082 ai eye repath 2025-02-20 00:14:06 -08:00
Majkl-J 3be0f55e62 Small fixes 2025-02-20 00:13:47 -08:00
MosleyandThe Sharkening 9c7cf5ebaf Bubber Edits for mutant bodypart PR #2903
This is all the edits done squashed together.
2025-01-21 00:32:56 -07:00
The SharkeningandGitHub 081046cb24 Subtler filters out clientless mobs (#2901)
## About The Pull Request

Per the tin, it will remove clientless mobs from the subtle menu.

## Why It's Good For The Game

Clientless mobs can't hear your sex

## Proof Of Testing

Works

## Changelog

🆑
fix: Subtler will now filter out clientless mobs
/🆑
2025-01-13 01:45:03 +00:00
The SharkeningandGitHub 319cf1ffef Buffs ERP by uncapping Subtler Range (#2883)
## About The Pull Request

Removes the subtler range and allows you to subtler anyone in view. 

## Why It's Good For The Game

I noticed there was a TK exception that allows an increased subtler
range, and I don't see the reason why we need to cap it only to just TK.

## Proof Of Testing

I tested it on the AI holopad and in person. It works.

## Changelog

🆑
add: Uncaps subtler range. Now anyone can subtler anyone else in view.
/🆑
2025-01-11 19:26:34 -05:00
WaterpigandGitHub ea02989f38 [SKYRAT CLEANUP] Removes / updates all bubber comments in the skyrat modular file as we are no longer their subject (#2330)
## About The Pull Request

"I'm going to extend my break" - Me, 2 days ago

"Hey I should start cleaning up the Skyrat modular folder" - Me, Today

I yet again fall victim to my own hubris

Left out some BUBBER TODOs, feel free to do these if you find them
manageable

## Why It's Good For The Game

We made some old mistakes with some edits (Like commenting out ruins
instead of making them unpickable for the ruin system) (This I fixed,
admins can now bus them in!)

We also made a lot of edits to Skyrat code, a lot of which can be
cleanly merged into their code now

## Proof Of Testing

If it compiles, it works.

Unlike my modularization PR from a year ago this is less fuckupable

## Changelog

N/A, not player facing
2024-11-16 14:20:10 +00:00
773a8c82b3 Improves Subtle and Subtler textbox distinction (#2281)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Renames the title of the text box from `Subtler` to `Subtler
Anti-Ghost`, both to reflect the verb's name, and to make it clearer
which one you're using.

## Why It's Good For The Game

teehoo

## Proof Of Testing

I looked at my code and it looked good.

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
add: Subtler Anti-Ghost's text box name is now "Subtler Anti-Ghost", to
give it better distinction with the Subtle box.
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

Co-authored-by: LT3 <83487515+lessthnthree@users.noreply.github.com>
2024-10-28 22:35:41 +00:00
LT3andGitHub 1cd7eda66c Fixes *meow and *purr emotes (and other emote third person keys) (#2278)
## About The Pull Request

MEOW MEOW MEOW

Fixes meow and purr after TG added pet emotes. Also fixes a bunch of
third person keys used incorrectly.

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game

MEOW

## Proof Of Testing


https://github.com/user-attachments/assets/313f0141-56fd-43e1-9133-44c462b6c05f

## Changelog

🆑 LT3
fix: Fixed meow and purr emotes playing the pet line instead of the
emote line
/🆑
2024-10-28 21:52:20 +00:00
StrangeWeirdKitten 25289b8bc6 fixes a fuck load of sounds 2024-10-24 07:52:55 -06:00
Majkl-J ae0b926948 Holy lord no more please 2024-10-24 03:07:38 -07:00
Waterpig 5da11912cb Merge branch 'master' of https://github.com/Skyrat-SS13/Skyrat-tg into upstream-2406a 2024-06-02 10:40:19 +02:00
61ec10c3e0 [MIRROR] grep's for "recieve" typos (#27826)
* grep's for "recieve" typos (#83369)

Just spellchecking some common mistakes.

* Missed these.

---------

Co-authored-by: Afevis <ShizCalev@users.noreply.github.com>
Co-authored-by: Useroth <37159550+Useroth@users.noreply.github.com>
2024-05-23 23:38:14 +02:00
536e6b7dd3 Adds prefs to the subtler sound (#881)
## About The Pull Request

See name

Also please testmerge this. It's my first time doing prefstuff I beg

## Why It's Good For The Game

You can opt out of the subtler sound!

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
qol: Subtler sound can now be toggled in game prefs
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put
your name to the right of the first 🆑 if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
2024-01-06 22:54:49 -05:00
WaterpigandGitHub 233e09bce6 Adds sound effects to the subtler emote (#752)
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request

See name


<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game


https://discordapp.com/channels/1059199070016655462/1071095123145924679/1176626744783016009
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Changelog

<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and it's effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->

🆑
sound: Subtler now has a sound cue
/🆑
2023-12-04 08:48:27 -07:00
d12245162c Allows mobs with telekinesis to subtler at range. (#25082)
* telekinesis subtler

increases subtler range for those with telekinesis.

* Update modular_skyrat/modules/verbs/code/subtle.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-11-18 02:27:42 -05:00
649c250702 [MIRROR] JSON Logging Take Two [MDB IGNORE] (#21329)
* JSON Logging Take Two

* Fixes the conflicts and makes our logs all comply with the new logging framework, hopefully.

---------

Co-authored-by: Zephyr <12817816+ZephyrTFA@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <jerego1234@hotmail.com>
2023-05-28 18:10:07 -04:00
5fae89404c Fixes master (#20103)
* Update subtle.dm

* Update modular_skyrat/modules/verbs/code/subtle.dm

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

---------

Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2023-03-26 23:56:38 +01:00
UserothandGitHub c76182a977 [TESTMERGE CANDIDATE] [SEMI-MODULAR] AI and hologram QoL stuff + misc bugfixes (#19248)
* Standarized silicon examine stuff.

* There we actually go

* Fuck, finally.

* Let's do something to amend the double-messages

* fixing a dumb copypaste

* How dumb of me

* Amendments

* oh well, this should take care of some runtimes

* this too

* Okay now it should compile

* Oh well, might as well do this too

* Dear got, subtler is full of spaghetti. Even before I touched it. It legitimately deserves a fucking rewrite.

* one way to resolve a conflict

* ordered tgstation.dme correctly now

* fiiiixed
2023-03-24 11:27:18 -04:00
RimiNoshaandGitHub e134959272 [MODULAR] Fixes Targeted Subtler (#16771)
I swear to god
2022-10-12 17:50:40 -04:00
TomandGitHub 80aa9d19a7 Subtler fix and slight tidy up (#16305)
* subtler fix and slight tidy up

* Update modular_skyrat/modules/verbs/code/subtle.dm

* review suggestions
2022-10-02 14:43:36 +01:00
ec0c71587e [MODULAR] Better Subtle and Subtler! (#15199)
* Better subtle and subtler!

* Commit some suggestions-

* Oh yea, that one too-

* I know how to code, I swear!

* Bye eventually-to-be-deprecated check!

* Actually TGUI the emote boxes!

* Apply suggestions!

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>

* Apply suggestions part 2!

Co-authored-by: Tom <8881105+tf-4@users.noreply.github.com>
Co-authored-by: GoldenAlpharex <58045821+GoldenAlpharex@users.noreply.github.com>
2022-08-04 15:57:34 +01:00
TomandGitHub 6d3a8fbec7 goodbye box comments (#13826) 2022-05-23 17:00:34 +01:00
GoldenAlpharexandGitHub 01db35d656 The Roleplay Update - Slightly more versatile emotes (#9395)
* Better emotes and auto-punctuation.

* Making ' and " work, adding ' to the characters that cause the space to get removed

* Making one part use RegEx

* Makes this even better.

* Removing auto-punctuation

* Improving subtler code, again.

* Time to test this out instead

* Properly fixing it, while also making it more efficient, yeet!
2021-11-25 04:14:30 +00:00
TomandGitHub 21f894e9b8 Spans to procs (#9495) 2021-11-16 23:29:43 +00:00
GandalfandGitHub 4a950241b6 [PRIORITY] MODULARISATION AUDIT PART 1: MAKING SKYRAT GREAT AGAIN (#9464)
* EFT

* E

* EEE

* E

* INTO TO ORBIT

* I hate this but I'm going to ignore it.

* Seriously, fuck this.

* Update CentCom_skyrat_z2.dmm

* Update tgstation.dme

* oops

* Update positronic_alert_console.dm

* E
2021-11-16 12:01:30 -05:00