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

[MIRROR] Fix piping in Northstar Ordinance #2110

Merged
merged 1 commit into from
Feb 24, 2024
Merged

[MIRROR] Fix piping in Northstar Ordinance #2110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 30 additions & 16 deletions _maps/map_files/NorthStar/north_star.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8049,9 +8049,7 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/layer2{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 4
},
/obj/machinery/atmospherics/components/unary/vent_scrubber,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
"bYp" = (
Expand Down Expand Up @@ -10363,9 +10361,6 @@
/obj/effect/spawner/structure/window/hollow/plasma/middle{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 4
},
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
"cBU" = (
Expand Down Expand Up @@ -17584,6 +17579,7 @@
/area/station/security/office)
"exv" = (
/obj/machinery/atmospherics/pipe/smart/manifold/purple/visible/layer2,
/obj/machinery/atmospherics/pipe/smart/simple/purple,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"exw" = (
Expand Down Expand Up @@ -22107,8 +22103,9 @@
/area/station/maintenance/floor3/starboard)
"fLX" = (
/obj/structure/railing/corner,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
/obj/machinery/atmospherics/pipe/smart/simple/purple,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
Expand Down Expand Up @@ -22358,8 +22355,8 @@
/turf/open/floor/grass,
/area/station/security/courtroom)
"fPd" = (
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
Expand Down Expand Up @@ -32627,6 +32624,9 @@
/obj/structure/railing{
dir = 4
},
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
dir = 1
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"ixf" = (
Expand Down Expand Up @@ -39349,6 +39349,7 @@
dir = 1
},
/obj/effect/spawner/structure/window/hollow/plasma/middle,
/obj/machinery/atmospherics/pipe/smart/simple/purple,
/turf/open/floor/engine/vacuum,
/area/station/science/ordnance/freezerchamber)
"kiA" = (
Expand Down Expand Up @@ -46081,6 +46082,13 @@
/obj/structure/flora/bush/flowers_yw/style_random,
/turf/open/floor/grass,
/area/station/science/genetics)
"lRw" = (
/obj/machinery/atmospherics/pipe/smart/simple/dark/visible{
dir = 4
},
/obj/machinery/atmospherics/pipe/smart/simple/purple,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"lRF" = (
/obj/effect/turf_decal/trimline/brown/filled/line{
dir = 1
Expand Down Expand Up @@ -54876,8 +54884,8 @@
/area/station/engineering/lobby)
"obC" = (
/obj/machinery/atmospherics/pipe/smart/manifold4w/scrubbers/hidden/layer2,
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible{
dir = 4
/obj/machinery/atmospherics/pipe/smart/simple/scrubbers/visible/layer4{
dir = 8
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
Expand Down Expand Up @@ -88679,6 +88687,12 @@
dir = 5
},
/area/station/security/prison)
"wLQ" = (
/obj/machinery/atmospherics/pipe/layer_manifold/scrubbers/visible{
dir = 4
},
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"wLV" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer2{
dir = 4
Expand Down Expand Up @@ -90129,10 +90143,10 @@
"xgo" = (
/obj/machinery/door/firedoor/border_only,
/obj/structure/railing,
/obj/machinery/atmospherics/components/unary/portables_connector/visible{
/obj/effect/turf_decal/box/red,
/obj/machinery/atmospherics/components/unary/portables_connector/visible/layer4{
dir = 8
},
/obj/effect/turf_decal/box/red,
/turf/open/floor/iron/dark,
/area/station/science/ordnance/testlab)
"xgC" = (
Expand Down Expand Up @@ -314996,7 +315010,7 @@ xpL
qRI
mKO
rDL
fPd
wLQ
jha
nPE
xVV
Expand Down Expand Up @@ -316023,7 +316037,7 @@ rrs
bYl
kiw
exv
wMU
lRw
fLX
ixd
bDn
Expand Down
4 changes: 4 additions & 0 deletions modular_nova/master_files/code/modules/client/preferences/headshot.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@
to_chat(usr, span_warning("The image must be hosted on one of the following sites: 'Gyazo, Discord'"))
return

apply_headshot(value)
return TRUE

/datum/preference/text/headshot/proc/apply_headshot(value)
if(stored_link[usr.ckey] != value)
to_chat(usr, span_notice("Please use a relatively SFW image of the head and shoulder area to maintain immersion level. Think of it as a headshot for your ID. Lastly, [span_bold("do not use a real life photo or use any image that is less than serious.")]"))
to_chat(usr, span_notice("If the photo doesn't show up properly in-game, ensure that it's a direct image link that opens properly in a browser."))
Expand Down
Loading