From 8a3829d957e121a28f2b2428fe4d10ab42b7a511 Mon Sep 17 00:00:00 2001
From: DreamySkrell <107256943+DreamySkrell@users.noreply.github.com>
Date: Tue, 19 Sep 2023 14:56:04 +0200
Subject: [PATCH] a (#17371)

---
 code/modules/shuttles/landmarks.dm            |   7 ++-
 .../DreamySkrell-landmark-sprite.yml          |  41 ++++++++++++++++++
 icons/effects/map_effects_96x96.dmi           | Bin 0 -> 1386 bytes
 maps/sccv_horizon/code/sccv_horizon_lifts.dm  |   4 ++
 4 files changed, 50 insertions(+), 2 deletions(-)
 create mode 100644 html/changelogs/DreamySkrell-landmark-sprite.yml
 create mode 100644 icons/effects/map_effects_96x96.dmi

diff --git a/code/modules/shuttles/landmarks.dm b/code/modules/shuttles/landmarks.dm
index 5e9dca35f4f..e9dd5262819 100644
--- a/code/modules/shuttles/landmarks.dm
+++ b/code/modules/shuttles/landmarks.dm
@@ -1,12 +1,15 @@
 //making this separate from /obj/effect/landmark until that mess can be dealt with
 /obj/effect/shuttle_landmark
 	name = "Nav Point"
-	icon = 'icons/effects/effects.dmi'
-	icon_state = "energynet"
+	icon = 'icons/effects/map_effects_96x96.dmi'
+	icon_state = "shuttle_landmark"
 	anchored = TRUE
 	unacidable = TRUE
 	simulated = 0
 	invisibility = 101
+	layer = ABOVE_ALL_MOB_LAYER
+	pixel_x = -32
+	pixel_y = -32
 
 	var/landmark_tag
 	//ID of the controller on the dock side
diff --git a/html/changelogs/DreamySkrell-landmark-sprite.yml b/html/changelogs/DreamySkrell-landmark-sprite.yml
new file mode 100644
index 00000000000..7418519c8e6
--- /dev/null
+++ b/html/changelogs/DreamySkrell-landmark-sprite.yml
@@ -0,0 +1,41 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#   admin
+#   backend
+#   security
+#   refactor
+#################################
+
+# Your name.
+author: DreamySkrell
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - rscadd: "Adds a clearer, directional sprites for shuttle landmarks. Also a lift variant. Does not actually remap landmarks to match direction."
diff --git a/icons/effects/map_effects_96x96.dmi b/icons/effects/map_effects_96x96.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..4a86d30261adf5b147a7ed14b00b79d457eac371
GIT binary patch
literal 1386
zcmV-w1(o`VP)<h;3K|Lk000e1NJLTq00AHX006)O0{{R3+1^$q00009P)t-sz`(#}
z|1-eAz`A+O4gdfE0d!JMQvg8b*k%9#0DpQ^Sad{Xb7OL8aCB*JZU6vyoKseCa&`Cg
zQ*iP1<SI)oD$dN$Q?OMq(KF!UEYD0S$pCUJ&A2!-QZv&tN+6u#lEji!AXBM0qqL+X
zCpA7NF)t-Iu_#-Ki!&v&s2HT5i!-e#F*g;&HbiL1$xJK3qS_EewX%Y%p9|PM0N4^N
z$^w;;i~s-xgh@m}RA_<io7)bgAPhiD0`HjU|I}pWok`&Te`UES7X<||8#iko=2GFL
zv{0GK0IVXFQeSlMYJ#HJ>q?TJS~>tjhMNY@0^KFje<C0KQZ#94M}&Dr*xRBTC<&Z^
zl$41o5GjEK2tH3hDb*IqZG#Mm<Um?Rg2POJa&vV9%2`NMj-op<0s}Fij73w_?sRB`
zshL{P-bVpM0|@h=kx{@8g;5Xjz}W!=3bG&~M?gW{#WIL{5R-Y36S^779>i7<Wk(=5
z1x+i6XT!e*73b0T>jH(SvDt%4;jaVf>9c@n6$lF7CHEjbfqR@ic@P|i{}kjBh<oh=
zjdy|Q3Ob(I=O9=?w9nZA#JfPz6*mzsTV#^Qkwvu<Wk?gg2h1a#K#P~!K>V0fFU)^Z
z+1t@>6S2PA-9l`j@}IJtdXSgZ;a5S_gXo^pAkufIEPFluT1>V2_P2gA$v+3;k<~HC
z>Z7r(D~t>HWI-6(Bp|ELfM$g3swGROQ$0CuFPVvw4`{H+>G#_jr_Zdl!Cdfz4j`xB
z-`AWz1JXkVGVei7AMKA8kke;CCYB+d0p#?-*-XXyEhYofenFGq=M*HJhlz0QD=cDE
zZ-oS98;dGIUu7pQj*}z|DF-@kL2Sv8Cl-nCtn&m40|EoWEofv_L*o)=6DbXv42bPO
z>mKq9Bn;@IeKh@mYm3B1&|pE*gkO(y)ITTo&aMH?itD{UeC<4%bjsL=pQtK}^tN4Z
z=n>ZmN#VBv(V-5c6Y+#5{Og5b17ejRE69pVL=tiWs$H}TzPxCw)5roUrjg3T2C06h
zu1>XK9$9^EH-c5kKkSdJJ_oA19R-lpU;iy~pV&RYPt?~&N}Gu1ftp=$z3U<9x=D`*
zU6;oX?FBs&bX$ge9_S4GB+zkLx&~BLmaYLMW$BiVv6!gEW$7+ZQkK39g0w7sU24nH
z6`;DZbOp%CSy}oo%3Yg?2ZCOC<&{@ndF7Q?{#PNwJ||lXOYEDT_K6Bk{~YK<TB|nO
z0%cUdObVSfAdE|<5eOmw9IXUOi@1@KtiGO9Dl5xkxw&LfTIdc#OAF=|ptSTJKxqlT
z0u(<C!1!SS=AWZgfj;6c5Wfke?iyO`>^=~E7>J1RCX3ij;U{-Fy9bm$QjS)8yG8M$
zMc%P!<1~UjX(T-e5Iu8jOKfRM#e%+0Ft{S>*P8sb48YdgP6BGX9f66lZ$AanmB$*w
zA1&fhb>`&UQck$HBR;Hj;owsK1Q@n?+DPc3A}x|u5>cUln1FgaVCslhCB$3DlCsMu
zmf|C3QfJGi)$iVy3>lqVp_~h7*+hVyGW%@}a50klX=y-6SCC3ds(KN&oed02WV<jL
zqLx|&m{u?w(vb!65(wKslUP9<FV|Gl@Q-(aSRZKeAe3Do^gcq`10vv~*74NAg8V$1
zGv`DaKw(0D$D2U1%SZMu;y|Jg6lON`flSI?K)lOGCZXN}0?cN}c2@r2ZYxFDzkl>w
sblcD@2=4JwuWU*hlREiJ)jtFJ1CHl{#H`QW^#A|>07*qoM6N<$f~^^MaR2}S

literal 0
HcmV?d00001

diff --git a/maps/sccv_horizon/code/sccv_horizon_lifts.dm b/maps/sccv_horizon/code/sccv_horizon_lifts.dm
index 0eefc5a18c6..3242bd4c51a 100644
--- a/maps/sccv_horizon/code/sccv_horizon_lifts.dm
+++ b/maps/sccv_horizon/code/sccv_horizon_lifts.dm
@@ -81,6 +81,10 @@
 	waypoint_station = "nav_morgue_lift_bottom"
 	waypoint_offsite = "nav_morgue_lift_top"
 
+/obj/effect/shuttle_landmark/lift
+	name = "ABSTRACT DEF; DO NOT USE THIS"
+	icon_state = "lift_landmark"
+
 /obj/effect/shuttle_landmark/lift/morgue_top
 	name = "Morgue Top"
 	landmark_tag = "nav_morgue_lift_top"