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

Misc Oshan fixes #426

Merged
merged 27 commits into from
Oct 9, 2023
Merged

Misc Oshan fixes #426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
c494509
fixes and spriting
polygoblyn Oct 6, 2023
76e03c6
mining gps
polygoblyn Oct 6, 2023
9e2241a
why do you hate singular nouns
polygoblyn Oct 6, 2023
f57ecbe
neighbors ree
polygoblyn Oct 6, 2023
4881494
let's not do perma oshan shall we
polygoblyn Oct 6, 2023
645e14a
moved medbay around
polygoblyn Oct 6, 2023
0f3d93a
linter
polygoblyn Oct 7, 2023
0bfb3e4
Merge remote-tracking branch 'origin/master' into oshan-fixes
polygoblyn Oct 7, 2023
4104afc
tweaks
polygoblyn Oct 7, 2023
d531b6f
a
polygoblyn Oct 7, 2023
9ec1f50
aaaaa
polygoblyn Oct 7, 2023
bd9d016
bar
polygoblyn Oct 7, 2023
d3ab861
ppp
polygoblyn Oct 7, 2023
79c8b11
f
polygoblyn Oct 7, 2023
f97ad47
ben is short
polygoblyn Oct 7, 2023
d4540b7
im drungk
polygoblyn Oct 7, 2023
bcf6b3e
wrestling ring
polygoblyn Oct 7, 2023
b351fd8
im not afraid of commitment
polygoblyn Oct 7, 2023
278dd1c
does this help?
polygoblyn Oct 7, 2023
11c4242
Revert "does this help?"
polygoblyn Oct 7, 2023
a11936e
rasslin
polygoblyn Oct 7, 2023
7f78387
finish railing sprites, fix up lighting
polygoblyn Oct 8, 2023
2214f46
cleanup
polygoblyn Oct 8, 2023
e375485
poop
polygoblyn Oct 8, 2023
8337e00
wuh
polygoblyn Oct 8, 2023
6b8d1c3
bathrooms
polygoblyn Oct 8, 2023
266c24e
more tweaks
polygoblyn Oct 8, 2023
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
22 changes: 21 additions & 1 deletion _maps/map_files/Mining/Oshan.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,26 @@
/obj/structure/cable,
/turf/open/floor/plating,
/area/station/security/prison/visit)
"hs" = (
/obj/structure/rack,
/obj/item/gps/mining{
pixel_x = 8;
pixel_y = -2
},
/obj/item/gps/mining{
pixel_x = -6;
pixel_y = 4
},
/obj/item/gps/mining{
pixel_x = -6;
pixel_y = -2
},
/obj/item/gps/mining{
pixel_x = 8;
pixel_y = 4
},
/turf/open/floor/iron,
/area/mine/production)
"hC" = (
/obj/machinery/power/apc/auto_name/directional/west,
/obj/structure/cable,
Expand Down Expand Up @@ -24900,7 +24920,7 @@ mt
nW
nW
nW
bE
hs
Jq
Ev
Hv
Expand Down
Loading
Loading