Merge pull request Civ13#2891 from savethetreez/master

Aiming cross restoring
KanohaShinobi · May 28, 2024 · d5a0cc0 · d5a0cc0
2 parents aa76e3a + 90f54cb
commit d5a0cc0
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm
@@ -102,13 +102,13 @@ var/list/global_huds = list(
 	fov.screen_loc = "4,1"
 	fov.mouse_opacity = FALSE
 	fov.layer = 18
-/*
+
 	aim_cross = new /obj/screen/aiming_cross()
 	fov.name = " "
 	fov.screen_loc = "1,1"
 	fov.mouse_opacity = FALSE
 	fov.layer = 21
-*/
+
 	cover = new /obj/screen/cover()
 	noise = new /obj/screen/noise()
 	fishbed = new /obj/screen/fishbed()

diff --git a/code/modules/client/preferencesSQLite/preference_setup/global/setting_datums.dm b/code/modules/client/preferencesSQLite/preference_setup/global/setting_datums.dm
@@ -122,6 +122,12 @@ var/list/_client_preferences_by_type
 	if (!enabled)
 		preference_mob.set_typing_indicator(0)
 
+/*/datum/client_preference/dynamic_aiming_cross
+	description = "Dynamic aiming cross"
+	key = "SHOW_DYN_CROSS"
+	enabled_description = "Show"
+	disabled_description = "Hide"*/
+
 /datum/client_preference/show_ooc
 	description ="OOC chat"
 	key = "CHAT_OOC"