Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TGUI pipe dispenser #3464

Merged
merged 5 commits into from
Oct 4, 2024
Merged

TGUI pipe dispenser #3464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cc4f5b2
adds js file and heavily reworks pipe dispenser file
Thera-Pissed Oct 2, 2024
29ad75d
updates junker's pipe dispenser
Thera-Pissed Oct 2, 2024
594586b
regex "/obj/..." fix
Thera-Pissed Oct 2, 2024
3925524
corrects regex file for removed text2path and non-bitwise << uses
Thera-Pissed Oct 2, 2024
551b04c
Merge branch 'master' into tgui-pipe-dispenser
FalloutFalcon Oct 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_junker.dmm
View file
Open in desktop
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
View file
Open in desktop
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
Loading