Commit Graph
15 Commits
Author SHA1 Message Date
a33fd49968 Upstream 12 15 25 unique reskins fixes (#5019)
This branch needs help, tons of datums to make for the customizable
items.

---------

Co-authored-by: Alexis <catmc8565@gmail.com>
2026-01-10 13:14:26 -05:00
Roxy 6c94fcb601 Fixes for #92205 2025-07-30 17:38:43 -04:00
RoxyandGitHub 5020cec410 Fix define sanity linter failures (#3209)
Fix all of the define sanity failures, either by adding an `#undef`
where needed or moving them to a file in `code/__DEFINES`

![image](https://github.com/user-attachments/assets/abd76dcd-d610-4567-801e-ee7fc477d58c)
2025-03-06 03:24:59 -05:00
RoxyandWaterpig 7600837c59 Upstream lint fixes (#3186)
Fixes all the failing grep checks in #3157, doesn't fix the define
sanity fails because im tired

![image](https://github.com/user-attachments/assets/b40fc081-a5c9-4f46-9cf5-18ed85199435)
2025-03-05 13:23:05 +01:00
Majkl-J 3b917fabf1 status effect checks 2025-02-28 07:08:45 -08:00
Majkl-J f8afcf8532 belt_icon_state -> inside_belt_icon_state 2025-02-20 00:29:33 -08:00
LexandGitHub 28ed213197 [PORT] [TGUI] Color picker (#2670)
## About The Pull Request
Port of the color selection TGUI interface from
BeeStation/Artea-Station.
https://github.com/BeeStation/BeeStation-Hornet/pull/9417
https://github.com/Artea-Station/Artea-Station-Server/pull/525

This implementation includes a port and adaptation to React, as TG has
discontinued the use of Inferno.

If the Input: Enable TGUI parameter is disabled in the UI Tab, the old
color selection mechanism will be used instead. The new interface
supports copying the color value in the #343231 format and allows
entering a 6-character hexadecimal color code.
Additionally, a color palette for selection is available.
## Why It's Good For The Game
The TGUI color picker is more adaptable and prettier.
## Proof Of Testing
<details>
<summary>Screenshots/Videos</summary>


![image](https://github.com/user-attachments/assets/55f56807-7c76-41a1-8c75-7ed293d581e9)

![image](https://github.com/user-attachments/assets/7742e741-a16b-4708-8e7b-7891f426de32)

![image](https://github.com/user-attachments/assets/6e22e138-af41-447d-95e6-fb6ca7d067af)


</details>

## Changelog
🆑 itsmeow (original), RimiNosha, Phoenix404 (port)
add: Added TGUI-based color palette and replaced all usages of BYOND
color palettes with it (TGUI input preferences are still respected).
/🆑
2025-01-11 11:38:00 -08:00
WaterpigandGitHub 12f61ac2ae Fix varnames and spelling in physgun and phystool (#2361)
## About The Pull Request

I was recently bugfixing these and discovered how bad the english on
these is. How this passed review is beyond me.

## Why It's Good For The Game

Spellcheck good

## Proof Of Testing

Varname changes, should be fine

## Changelog

N/A
2024-11-07 23:05:59 +00:00
WaterpigandGitHub b8f00860e4 Afterattack fixes (#2350)
## About The Pull Request

See name, I'm actually going through with it and doing it.

## Why It's Good For The Game

Fixes broken item interactions

closes #2253
closes #2204

## Proof Of Testing

Worked on my device (So far)

## Changelog

🆑
fix: Phystool and Physgun work correctly again
fix: Clockcult slabs can examine again
fix: Compostbin is now handled correctly
fix: Robohand checks for robohand again
/🆑
2024-11-07 09:42:41 +01:00
StrangeWeirdKitten 4576f84b64 I hate this so much 2024-10-24 08:39:15 -06:00
Majkl-J ff590ce7b4 getting it to compile 2024-10-20 04:26:59 -07:00
Waterpig 55550cb524 Upstream fixes 2024-06-28 10:02:14 +02:00
nevimer fa65d517dd fixups 2024-04-28 19:24:33 -04:00
StrangeWeirdKitten de2a396d7d Fixes conflicts.
Update ss13_construct.json

AAAAAAAAAAA

maybe this will work.

Update _basemap.dm

Update _basemap.dm

here is the failure.

Update ss13_construct.json

more CI

weee more linters

one more god damn linter

more linters

I might as well fix CI too

Fixes map linters

Guardians was converted to a basic mob

Fixes broken procs
2023-11-20 17:07:11 -07:00
FenyshaGitHubResomi Enjoer <fenyshaarmagedon.gmai.com>OceanFish1nevimer
8a31efc1ff SS13 construct (#593)
<!-- 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

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

This PR, will add to the game a new test map SS13 construct, a port of
the famous map from Garys Mod, by ocean_fish. Also, a number of tools
from the same game - namely:

Physgun, tools to manipulate the gravity of objects.
Phystool, or toolgun with five modes of operation.
Fly, Noclip. 


![ss13_construct_full](https://github.com/Bubberstation/Bubberstation/assets/126053988/c5a99d33-8ffc-4203-9ef2-3217ade3ca04)
https://youtu.be/lGXmsiecvfo
## Why It's Good For The Game

<!-- 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. -->
New, user-friendly test tools.

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

🆑
add: Added new map SS13 Construct
add: Added new new debug tool: physgun, phystool
add: Added new abilites: noclip, fly
sound: added phystools sounds
config: added SS13 constuct to avaible maps
/🆑

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

---------

Co-authored-by: Resomi Enjoer <fenyshaarmagedon.gmai.com>
Co-authored-by: OceanFish1 <65843722+OceanFish1@users.noreply.github.com>
Co-authored-by: nevimer <77420409+nevimer@users.noreply.github.com>
2023-11-06 21:32:36 -05:00