[MIRROR] Fix piping in Northstar Ordinance (#1113)

* Fix piping in Northstar Ordinance (#81592) ## About The Pull Request I fixed a minor issue on northstar The issue was there was a piping disaster in toxins and I reworked it to be countered so it could work as intended now it works as its supposed to. ## Why It's Good For The Game Pipe rework in northstar toxins ## Changelog :cl: Piping rework to fix an error :cl: * Fix piping in Northstar Ordinance * Update headshot.dm --------- Co-authored-by: Bobabiboo <[email protected]> Co-authored-by: Mal <[email protected]>
Fluffy-Frontier · Feb 23, 2024 · 307c57a · 307c57a
1 parent 2834330
commit 307c57a
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 16 deletions.
diff --git a/_maps/map_files/NorthStar/north_star.dmm b/_maps/map_files/NorthStar/north_star.dmm
@@ -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" = (
@@ -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" = (
@@ -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" = (
@@ -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)
@@ -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)
@@ -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" = (
@@ -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" = (
@@ -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
@@ -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)
@@ -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
@@ -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" = (
@@ -314996,7 +315010,7 @@ xpL
 qRI
 mKO
 rDL
-fPd
+wLQ
 jha
 nPE
 xVV
@@ -316023,7 +316037,7 @@ rrs
 bYl
 kiw
 exv
-wMU
+lRw
 fLX
 ixd
 bDn

diff --git a/modular_nova/master_files/code/modules/client/preferences/headshot.dm b/modular_nova/master_files/code/modules/client/preferences/headshot.dm
@@ -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."))