Merge branch 'MysticalFaceLesS:beta-dev' into new-slime-heads

code/__DEFINES/species_clothing_defines.dm

@@ -10,7 +10,7 @@
 #define DEFAULT_EARS_PATH 'icons/mob/clothing/ears.dmi'
 #define DEFAULT_MASK_PATH 'icons/mob/clothing/mask.dmi'
 #define DEFAULT_HEAD_PATH 'icons/mob/clothing/head.dmi'
-#define DEFAULT_NECK_PATH 'icons/mob/clothing/neck.dmi'
+// #define DEFAULT_NECK_PATH 'icons/mob/clothing/neck.dmi'		//MOD_CELADON-CHANGES -> mod_celadon\__DEFINES\code\__DEFINES\species_clothing_defines.dm
 #define DEFAULT_GLOVES_PATH 'icons/mob/clothing/hands.dmi'
 #define DEFAULT_GLASSES_PATH 'icons/mob/clothing/eyes.dmi'
 #define DEFAULT_BELT_PATH 'icons/mob/clothing/belt.dmi'

code/game/objects/items/binoculars.dm

@@ -5,11 +5,11 @@
 	icon_state = "binoculars"
 	lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
 	righthand_file = 'icons/mob/inhands/items_righthand.dmi'
-	slot_flags = ITEM_SLOT_BELT
+	// slot_flags = ITEM_SLOT_BELT		//MOD_CELADON-CHANGES -> mod_celadon\QoL\code\binoculars.dm
 	w_class = WEIGHT_CLASS_SMALL
-	var/mob/listeningTo
-	var/zoom_out_amt = 5.5
-	var/zoom_amt = 10
+	// var/mob/listeningTo		//MOD_CELADON-CHANGES -> mod_celadon\QoL\code\binoculars.dm
+	// var/zoom_out_amt = 5.5
+	// var/zoom_amt = 10
 
 /obj/item/binoculars/Initialize()
 	. = ..()

code/game/objects/items/storage/wallets.dm

@@ -11,34 +11,34 @@
 	var/list/combined_access
 	var/cached_flat_icon
 
-/obj/item/storage/wallet/ComponentInitialize()
-	. = ..()
-	var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/wallet)
-	STR.max_items = 4
-	STR.set_holdable(list(
-		/obj/item/spacecash/bundle,
-		/obj/item/holochip,
-		/obj/item/card,
-		/obj/item/clothing/mask/cigarette,
-		/obj/item/flashlight/pen,
-		/obj/item/seeds,
-		/obj/item/stack/medical,
-		/obj/item/toy/crayon,
-		/obj/item/coin,
-		/obj/item/dice,
-		/obj/item/disk,
-		/obj/item/implanter,
-		/obj/item/lighter,
-		/obj/item/lipstick,
-		/obj/item/match,
-		/obj/item/paper,
-		/obj/item/pen,
-		/obj/item/photo,
-		/obj/item/reagent_containers/dropper,
-		/obj/item/reagent_containers/syringe,
-		/obj/item/screwdriver,
-		/obj/item/stamp),
-		list(/obj/item/screwdriver/power))
+// /obj/item/storage/wallet/ComponentInitialize()		//MOD_CELADON-CHANGES -> mod_celadon\QoL\code\wallets.dm
+// 	. = ..()
+// 	var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/wallet)
+// 	STR.max_items = 4
+// 	STR.set_holdable(list(
+// 		/obj/item/spacecash/bundle,
+// 		/obj/item/holochip,
+// 		/obj/item/card,
+// 		/obj/item/clothing/mask/cigarette,
+// 		/obj/item/flashlight/pen,
+// 		/obj/item/seeds,
+// 		/obj/item/stack/medical,
+// 		/obj/item/toy/crayon,
+// 		/obj/item/coin,
+// 		/obj/item/dice,
+// 		/obj/item/disk,
+// 		/obj/item/implanter,
+// 		/obj/item/lighter,
+// 		/obj/item/lipstick,
+// 		/obj/item/match,
+// 		/obj/item/paper,
+// 		/obj/item/pen,
+// 		/obj/item/photo,
+// 		/obj/item/reagent_containers/dropper,
+// 		/obj/item/reagent_containers/syringe,
+// 		/obj/item/screwdriver,
+// 		/obj/item/stamp),
+// 		list(/obj/item/screwdriver/power))
 
 /obj/item/storage/wallet/Exited(atom/movable/AM)
 	. = ..()

code/modules/keybindings/setup.dm

@@ -22,32 +22,32 @@
 			erase_output = "[erase_output];[macro_name].parent=null"
 	winset(src, null, erase_output)
 
-/client/proc/set_macros()
-	set waitfor = FALSE
-
-	//Reset the buffer
-	reset_held_keys()
-
-	erase_all_macros()
-
-	var/list/macro_sets = SSinput.macro_sets
-	for(var/setname in macro_sets)
-		if(setname != "default")
-			winclone(src, "default", setname)
-		var/list/macro_set = macro_sets[setname]
-		for(var/key in macro_set)
-			var/command = macro_set[key]
-			winset(src, "[setname]-[REF(key)]", "parent=[setname];name=[key];command=[command]")
-
-	//Reactivate any active tgui windows mouse passthroughs macros
-	for(var/datum/tgui_window/window in tgui_windows)
-		if(window.mouse_event_macro_set)
-			window.mouse_event_macro_set = FALSE
-			window.set_mouse_macro()
-
-	if(prefs?.hotkeys)//tg put hotkeys at the client level, idk why, we still have it on prefs so I'm just gonna nullcheck this.
-		winset(src, null, "map.focus=true mainwindow.macro=default")
-	else
-		winset(src, null, "input.focus=true mainwindow.macro=old_default")
-
-	update_special_keybinds()
+// /client/proc/set_macros()		//MOD_CELADON-CHANGES -> mod_celadon\QoL\code\hotkeyfix.dm
+// 	set waitfor = FALSE
+
+// 	//Reset the buffer
+// 	reset_held_keys()
+
+// 	erase_all_macros()
+
+// 	var/list/macro_sets = SSinput.macro_sets
+// 	for(var/setname in macro_sets)
+// 		if(setname != "default")
+// 			winclone(src, "default", setname)
+// 		var/list/macro_set = macro_sets[setname]
+// 		for(var/key in macro_set)
+// 			var/command = macro_set[key]
+// 			winset(src, "[setname]-[REF(key)]", "parent=[setname];name=[key];command=[command]")
+
+// 	//Reactivate any active tgui windows mouse passthroughs macros
+// 	for(var/datum/tgui_window/window in tgui_windows)
+// 		if(window.mouse_event_macro_set)
+// 			window.mouse_event_macro_set = FALSE
+// 			window.set_mouse_macro()
+
+// 	if(prefs?.hotkeys)//tg put hotkeys at the client level, idk why, we still have it on prefs so I'm just gonna nullcheck this.
+// 		winset(src, null, "map.focus=true mainwindow.macro=default")
+// 	else
+// 		winset(src, null, "input.focus=true mainwindow.macro=old_default")
+
+// 	update_special_keybinds()

code/modules/mob/living/carbon/human/update_icons.dm

@@ -519,28 +519,28 @@ There are several things that need to be remembered:
 
 	apply_overlay(FACEMASK_LAYER)
 
-/mob/living/carbon/human/update_inv_neck()
-	remove_overlay(NECK_LAYER)
+// /mob/living/carbon/human/update_inv_neck()		////MOD_CELADON-CHANGES -> mod_celadon\QoL\code\update_icons.dm
+// 	remove_overlay(NECK_LAYER)
 
-	if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
-		var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
-		inv.update_appearance()
+// 	if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
+// 		var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
+// 		inv.update_appearance()
 
-	if(wear_neck)
-		var/obj/item/I = wear_neck
-		update_hud_neck(I)
-		if(!(ITEM_SLOT_NECK in check_obscured_slots()))
-			var/icon_file
-			var/handled_by_bodytype = TRUE
+// 	if(wear_neck)
+// 		var/obj/item/I = wear_neck
+// 		update_hud_neck(I)
+// 		if(!(ITEM_SLOT_NECK in check_obscured_slots()))
+// 			var/icon_file
+// 			var/handled_by_bodytype = TRUE
 
-			if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
-				handled_by_bodytype = FALSE
-				icon_file = DEFAULT_NECK_PATH
+// 			if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
+// 				handled_by_bodytype = FALSE
+// 				icon_file = DEFAULT_NECK_PATH
 
-			overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file, mob_species = CHECK_USE_AUTOGEN)
+// 			overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file, mob_species = CHECK_USE_AUTOGEN)
 
 
-	apply_overlay(NECK_LAYER)
+// 	apply_overlay(NECK_LAYER)
 
 /mob/living/carbon/human/update_inv_back()
 	remove_overlay(BACK_LAYER)

html/changelogs/AutoChangeLog-pr-368.yml

@@ -0,0 +1,4 @@
+author: Yata9arasu
+changes:
+  - {bugfix: 'Починен путь ПРа Быдла, наш .дме файл в шиптест.дме раскомменчен'}
+delete-after: true

mod_celadon/QoL/_QoL.dm

@@ -0,0 +1,5 @@
+/datum/modpack/QoL
+	name = "QoL"
+	desc = "Quality of Life"
+	author = "RalseiDreemuurr"
+

mod_celadon/QoL/_QoL.dme

@@ -0,0 +1,5 @@
+#include "_QoL.dm"
+#include "code/wallets.dm"
+#include "code/binoculars.dm"
+#include "code/update_icons.dm"
+#include "code/hotkeyfix.dm"

mod_celadon/QoL/code/binoculars.dm

@@ -0,0 +1,5 @@
+/obj/item/binoculars
+	slot_flags = ITEM_SLOT_NECK
+	var/mob/listeningTo
+	var/zoom_out_amt = 5.5
+	var/zoom_amt = 10

mod_celadon/QoL/code/hotkeyfix.dm

@@ -0,0 +1,36 @@
+/client/proc/set_macros()
+	set waitfor = FALSE
+
+	//Reset the buffer
+	reset_held_keys()
+
+	erase_all_macros()
+
+	var/list/macro_sets = SSinput.macro_sets
+	for(var/setname in macro_sets)
+		if(setname != "default")
+			winclone(src, "default", setname)
+		var/list/macro_set = macro_sets[setname]
+		for(var/key in macro_set)
+			var/command = macro_set[key]
+			winset(src, "[setname]-[REF(key)]", "parent=[setname];name=[key];command=[command]")
+
+	//Reactivate any active tgui windows mouse passthroughs macros
+	for(var/datum/tgui_window/window in tgui_windows)
+		if(window.mouse_event_macro_set)
+			window.mouse_event_macro_set = FALSE
+			window.set_mouse_macro()
+
+	if(prefs?.hotkeys)//tg put hotkeys at the client level, idk why, we still have it on prefs so I'm just gonna nullcheck this.
+		winset(src, null, "map.focus=true mainwindow.macro=default")
+	else
+		winset(src, null, "input.focus=true mainwindow.macro=old_default")
+
+	update_special_keybinds()
+
+/client/verb/fix_layout()
+	set name = "Исправить раскладку"
+	set category = "OOC"
+
+	set_macros()
+	to_chat(src, span_warning("Перерегистрация макросов выполнена. Если не сработало, убедитесь что раскладка переключена на английский язык."))

mod_celadon/QoL/code/update_icons.dm

@@ -0,0 +1,22 @@
+/mob/living/carbon/human/update_inv_neck()
+	remove_overlay(NECK_LAYER)
+
+	if(client && hud_used && hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1])
+		var/atom/movable/screen/inventory/inv = hud_used.inv_slots[TOBITSHIFT(ITEM_SLOT_NECK) + 1]
+		inv.update_appearance()
+
+	if(wear_neck)
+		var/obj/item/I = wear_neck
+		update_hud_neck(I)
+		if(!(ITEM_SLOT_NECK in check_obscured_slots()))
+			var/icon_file
+			var/handled_by_bodytype = TRUE
+
+			if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
+				handled_by_bodytype = FALSE
+				icon_file = DEFAULT_NECK_PATH
+
+			overlays_standing[NECK_LAYER] = wear_neck.build_worn_icon(default_layer = NECK_LAYER, default_icon_file = icon_file, mob_species = CHECK_USE_AUTOGEN)
+
+
+	apply_overlay(NECK_LAYER)

mod_celadon/QoL/code/wallets.dm

@@ -0,0 +1,30 @@
+/obj/item/storage/wallet/ComponentInitialize()
+	. = ..()
+	var/datum/component/storage/STR = GetComponent(/datum/component/storage/concrete/wallet)
+	STR.max_items = 4
+	STR.set_holdable(list(
+		/obj/item/spacecash/bundle,
+		/obj/item/holochip,
+		/obj/item/card,
+		/obj/item/clothing/mask/cigarette,
+		/obj/item/flashlight/pen,
+		/obj/item/seeds,
+		/obj/item/stack/medical,
+		/obj/item/toy/crayon,
+		/obj/item/coin,
+		/obj/item/dice,
+		/obj/item/disk,
+		/obj/item/implanter,
+		/obj/item/lighter,
+		/obj/item/lipstick,
+		/obj/item/match,
+		/obj/item/paper,
+		/obj/item/pen,
+		/obj/item/photo,
+		/obj/item/reagent_containers/dropper,
+		/obj/item/reagent_containers/syringe,
+		/obj/item/screwdriver,
+		/obj/item/stamp,
+		/obj/item/kitchen/knife/letter_opener,
+		/obj/item/key),
+		list(/obj/item/screwdriver/power))

mod_celadon/__DEFINES/___DEFINES.dm

@@ -0,0 +1,4 @@
+/datum/modpack/__DEFINES
+	name = "DEFINES"
+	desc = "Добавляет дефайны для наших нужд"
+	author = "MrCat"

mod_celadon/__DEFINES/___DEFINES.dme

@@ -0,0 +1,4 @@
+#include "___DEFINES.dm"
+
+#include "code/__DEFINES/species_clothing_defines.dm"
+#include "code/__DEFINES/fullscreen.dm"

mod_celadon/__DEFINES/code/__DEFINES/fullscreen.dm

@@ -0,0 +1 @@
+#define COMSIG_KB_CLIENT_FULLSCREEN_DOWN "keybinding_client_fullscreen_down"

mod_celadon/__DEFINES/code/__DEFINES/species_clothing_defines.dm

@@ -0,0 +1 @@
+#define DEFAULT_NECK_PATH 'mod_celadon/QoL/icons/neck.dmi'

mod_celadon/fullscreen/code/fullscreen.dm

@@ -1,4 +1,4 @@
-#define COMSIG_KB_CLIENT_FULLSCREEN_DOWN "keybinding_client_fullscreen_down"
+// #define COMSIG_KB_CLIENT_FULLSCREEN_DOWN "keybinding_client_fullscreen_down"		// Перенесён в mod_celadon\__DEFINES\code\__DEFINES\fullscreen.dm
 
 /client
 	var/fullscreen = FALSE

mod_celadon/mod_celadon.dme

@@ -5,12 +5,13 @@
 // #include "example/_example.dme"
 
 // --- MAINTENANCE --- //
+#include "__DEFINES/___DEFINES.dme"
 #include "fullscreen/_fullscreen.dme"
 #include "subtler/_subtler.dme"
 #include "radio_syndicate/_radio_syndicate.dme"
 #include "solgov_outfit/_solgov_outfit.dme"
 #include "ipc_chassis/_ipc_chassis.dme"
-
+#include "QoL/_QoL.dme"
 
 // --- ICONS --- //
 #include "species_changes/_species_changes.dme"