Skip to content

Commit

Permalink
TGUI pipe dispenser (shiptest-ss13#3464)
Browse files Browse the repository at this point in the history
<!-- 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
Implements a tweaked UI from rapid pipe dispensers for normal
(obj/machinery/pipedispenser) dispensers
Pipe dispensers now have a 5ms delay on prints and can make disposals
and transport tubes.
Removes dispenser/disposals and dispenser/transport because they're
redundant now.

![image](https://github.com/user-attachments/assets/73a9bd7a-7d5d-49d2-a8f2-3313350ee4c8)

updates text2path regex to 115 from 117
updates non-bitwise << uses to 262 from 266
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
The old UI sucks and is laggy and bad.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
add: pipe dispenser UI is now similar to rapid pipe dispenser UI.
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: 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: FalloutFalcon <[email protected]>
  • Loading branch information
2 people authored and MysticalFaceLesS committed Oct 6, 2024
1 parent 166a5aa commit 17e3e05
Show file tree
Hide file tree
Showing 4 changed files with 362 additions and 175 deletions.
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_junker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -2284,7 +2284,6 @@
/turf/closed/wall/r_wall,
/area/ship/maintenance/port)
"Ro" = (
/obj/machinery/pipedispenser/disposal,
/obj/item/reagent_containers/food/drinks/mug/tea{
pixel_y = 8;
pixel_x = -7
Expand All @@ -2305,6 +2304,7 @@
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
dir = 1
},
/obj/machinery/pipedispenser,
/turf/open/floor/plating,
/area/ship/maintenance/central)
"RQ" = (
Expand Down
4 changes: 2 additions & 2 deletions check_regex.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@ standards:
- exactly: [4, "/mob text paths", '"/mob']
- exactly: [42, "/obj text paths", '"/obj']
- exactly: [0, "/turf text paths", '"/turf']
- exactly: [117, "text2path uses", "text2path"]
- exactly: [115, "text2path uses", "text2path"]

- exactly: [18, "world<< uses", 'world[ \t]*<<']
- exactly: [0, "world.log<< uses", 'world.log[ \t]*<<']

- exactly:
[
266,
262,
"non-bitwise << uses",
'(?<!\d)(?<!\d\s)(?<!<)<<(?!=|\s\d|\d|<|\/)',
]
Expand Down
Loading

0 comments on commit 17e3e05

Please sign in to comment.