Merge pull request #950 from RalseiDreemuurr/sprites

Сборник изменений

code/__DEFINES/inventory.dm

@@ -84,9 +84,7 @@
 #define SNOUTED_VARIATION (1<<4) //Ex of naming: a state called "nameof_thing" can be named "nameof_thing_snouted"
 #define VOX_VARIATION (1<<5)
 #define KEPORI_VARIATION (1<<6)
-// [CELADON-ADD] - TAJARA
-#define TAJARA_VARIATION (1<<7)
-// [/CELADON-ADD]
+
 
 #define NOT_DIGITIGRADE 0
 #define FULL_DIGITIGRADE 1

code/modules/clothing/head/_head.dm

@@ -11,10 +11,7 @@
 	var/can_toggle = null
 	greyscale_icon_state = "hat"
 	greyscale_colors = list(list(16,26))
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION
 
 ///Special throw_impact for hats to frisbee hats at people to place them on their heads/attempt to de-hat them.
 /obj/item/clothing/head/throw_impact(atom/hit_atom, datum/thrownthing/thrownthing)

code/modules/clothing/masks/_masks.dm

@@ -10,10 +10,7 @@
 	var/modifies_speech = FALSE
 	var/mask_adjusted = 0
 	var/adjusted_flags = null
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION | KEPORI_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | KEPORI_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION | KEPORI_VARIATION
 
 /obj/item/clothing/mask/attack_self(mob/user)
 	if((clothing_flags & VOICEBOX_TOGGLABLE))

code/modules/clothing/spacesuits/hardsuit.dm

@@ -209,10 +209,7 @@
 	item_state = "eng_hardsuit"
 	siemens_coefficient = 0
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 75, "fire" = 100, "acid" = 75)
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/engine
 	resistance_flags = FIRE_PROOF
 
@@ -290,10 +287,7 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	custom_price = 2000
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/suit/space/hardsuit/mining/Initialize()
 	. = ..()
@@ -393,10 +387,16 @@
 			linkedsuit.name = initial(linkedsuit.name)
 			linkedsuit.desc = initial(linkedsuit.desc)
 			linkedsuit.clothing_flags |= STOPSPRESSUREDAMAGE
+			// [CELADON - ADD] - BALANCE
+			linkedsuit.slowdown = 0.7
+			// [CELADON - ADD]
 			linkedsuit.cold_protection |= CHEST | GROIN | LEGS | FEET | ARMS | HANDS
 		else
 			linkedsuit.name += " (combat)"
 			linkedsuit.desc = linkedsuit.alt_desc
+			// [CELADON - ADD] - BALANCE
+			linkedsuit.slowdown = linkedsuit.combat_slowdown
+			// [CELADON - ADD]
 			linkedsuit.clothing_flags &= ~STOPSPRESSUREDAMAGE
 			linkedsuit.cold_protection &= ~(CHEST | GROIN | LEGS | FEET | ARMS | HANDS)
 			if(linkedsuit.lightweight)
@@ -420,12 +420,12 @@
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi
 	jetpack = /obj/item/tank/jetpack/suit
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
-	slowdown = 0.5
-	var/combat_slowdown = 0 //slowdown when in combat mode
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
+	// [CELADON - EDIT] - BALANCE
+	// slowdown = 0.5 // [CELADON - EDIT] - ORIGINAL
+	// var/combat_slowdown = 0 //slowdown when in combat mode // [CELADON - EDIT] - ORIGINAL
+	var/combat_slowdown = 0.2
+	// [CELADON - EDIT]
 	var/lightweight = 0 //used for flags when toggling
 
 //Ramzi Syndie suit
@@ -449,11 +449,11 @@
 	lightweight = 1
 	jetpack = null
 	armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
-	slowdown = 0.7
+	// [CELADON - REMOVE] - BALANCE
+	// slowdown = 0.7 // [CELADON - REMOVE] - ORIGINAL
+	// [CELADON - REMOVE]
 	jetpack = null
-	// [CELADON-ADD] - TAJARA
 	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
-	// [/CELADON-ADD]
 
 //Elite Syndie suit
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite
@@ -486,10 +486,7 @@
 	heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | ACID_PROOF
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/suit/space/hardsuit/syndi/elite/debug
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite/debug
@@ -503,10 +500,7 @@
 	hardsuit_type = "cybersun"
 	armor = list("melee" = 25, "bullet" = 25, "laser" = 50, "energy" = 50, "bomb" = 25, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 60)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION
 
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun
 	name = "neutron-star combat hardsuit helmet"
@@ -525,10 +519,7 @@
 	hardsuit_type = "cyberparamed"
 	armor = list("melee" = 25, "bullet" = 25, "laser" = 35, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 65, "fire" = 75, "acid" = 40)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION
 	jetpack = null
 
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/cybersun/paramed
@@ -547,10 +538,7 @@
 	icon_state = "hardsuit1-pointman"
 	hardsuit_type = "pointman"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION
 
 
 /obj/item/clothing/head/helmet/space/hardsuit/syndi/inteq
@@ -606,10 +594,7 @@
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 10, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/medical
 	slowdown = 0.5
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/head/helmet/space/hardsuit/medical/cmo
 	name = "chief medical officer's hardsuit helmet"
@@ -672,10 +657,7 @@
 		/obj/item/aicard)
 	armor = list("melee" = 30, "bullet" = 5, "laser" = 10, "energy" = 20, "bomb" = 100, "bio" = 100, "rad" = 60, "fire" = 60, "acid" = 80)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/rd
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 	//Security hardsuit
 /obj/item/clothing/head/helmet/space/hardsuit/security
@@ -695,10 +677,7 @@
 	armor = list("melee" = 35, "bullet" = 15, "laser" = 30, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security
 	slowdown = 0.5
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/suit/space/hardsuit/security/Initialize()
 	. = ..()
@@ -720,10 +699,7 @@
 	armor = list("melee" = 45, "bullet" = 25, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 100, "rad" = 50, "fire" = 95, "acid" = 95)
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/hos
 	jetpack = /obj/item/tank/jetpack/suit
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 	//SWAT MKII
 /obj/item/clothing/head/helmet/space/hardsuit/swat
@@ -1063,10 +1039,7 @@
 	item_state = "independent_sec_helm"
 	hardsuit_type = "independent-sec"
 	armor = list("melee" = 35, "bullet" = 25, "laser" = 20,"energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION | SNOUTED_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | SNOUTED_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION | SNOUTED_VARIATION
 
 /obj/item/clothing/suit/space/hardsuit/security/independent
 	icon_state = "hardsuit-independent-sec"
@@ -1077,10 +1050,7 @@
 	hardsuit_type = "independent-sec"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent
 	armor = list("melee" = 35, "bullet" = 25, "laser" = 20, "energy" = 40, "bomb" = 10, "bio" = 100, "rad" = 50, "fire" = 75, "acid" = 75)
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION | DIGITIGRADE_VARIATION
 
 	//Mining
 /obj/item/clothing/head/helmet/space/hardsuit/mining/independent
@@ -1225,10 +1195,7 @@
 	item_state = "hardsuit-inteq"
 	hardsuit_type = "inteq"
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/independent/inteq
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION | VOX_VARIATION
 
 /obj/item/clothing/head/helmet/space/hardsuit/solgov
 	name = "\improper SolGov hardsuit helmet"
@@ -1247,10 +1214,7 @@
 	helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov
 	allowed = list(/obj/item/gun, /obj/item/ammo_box,/obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/melee/transforming/energy/sword/saber, /obj/item/restraints/handcuffs, /obj/item/tank/internals)
 	slowdown = 0.5
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = DIGITIGRADE_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = DIGITIGRADE_VARIATION
 
 /obj/item/clothing/head/helmet/space/hardsuit/quixote
 	name = "\improper Quixote mobility hardsuit helmet"

code/modules/clothing/suits/_suits.dm

@@ -15,10 +15,7 @@
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/exo //WS Edit - Exowear Pockets
 	greyscale_colors = list(list(13, 16), list(10, 18), list(13, 21))
 	greyscale_icon_state = "coat"
-	// [CELADON-EDIT] - TAJARA
-	// supports_variations = VOX_VARIATION // CELADON-EDIT - ORIGINAL
-	supports_variations = VOX_VARIATION | TAJARA_VARIATION
-	// [/CELADON-EDIT]
+	supports_variations = VOX_VARIATION
 	mob_overlay_icon = 'icons/mob/clothing/suit.dmi'
 
 /obj/item/clothing/suit/worn_overlays(isinhands = FALSE)

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

@@ -524,8 +524,13 @@ There are several things that need to be remembered:
 				handled_by_bodytype = TRUE
 
 		// [CELADON-ADD] - TAJARA
-		if((I.supports_variations & TAJARA_VARIATION) && (dna.species.bodytype & BODYTYPE_TAJARA))
-			icon_file = TAJARA_HEAD_PATH
+		else if(BODYTYPE_TAJARA)
+			if(icon_exists(SARATHI_SNOUTED_HELM_PATH, RESOLVE_ICON_STATE(I)))
+				icon_file = SARATHI_SNOUTED_HELM_PATH
+				if(I.snout_override_icon)
+					icon_file = I.snout_override_icon
+			else
+				handled_by_bodytype = TRUE
 		// [/CELADON-ADD]
 
 		if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
@@ -637,8 +642,11 @@ There are several things that need to be remembered:
 				handled_by_bodytype = TRUE
 
 		// [CELADON-ADD] - TAJARA
-		else if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
-			icon_file = TAJARA_SUIT_PATH
+		else if(BODYTYPE_TAJARA)
+			if(icon_exists(TAJARA_SUIT_PATH, RESOLVE_ICON_STATE(I)))
+				icon_file = TAJARA_SUIT_PATH
+			else
+				handled_by_bodytype = TRUE
 		// [/CELADON-ADD]
 
 		if(!(icon_exists(icon_file, RESOLVE_ICON_STATE(I))))
@@ -735,8 +743,13 @@ There are several things that need to be remembered:
 					handled_by_bodytype = TRUE
 
 			// [CELADON-ADD] - TAJARA
-			if((dna.species.bodytype & BODYTYPE_TAJARA) && (I.supports_variations & TAJARA_VARIATION))
-				icon_file = TAJARA_MASK_PATH
+			else if(BODYTYPE_TAJARA)
+				if(icon_exists(SARATHI_SNOUTED_MASK_PATH, RESOLVE_ICON_STATE(I)))
+					icon_file = SARATHI_SNOUTED_MASK_PATH
+					if(I.snout_override_icon)
+						icon_file = I.snout_override_icon
+				else
+					handled_by_bodytype = TRUE
 			// [/CELADON-ADD]
 
 

mod_celadon/balance/README.md

@@ -76,6 +76,10 @@ EDIT:
 
 ADD: 
 `code/modules/vending/_vending.dm` : Добавлена вероятность поломки автомата при уничтожение его с вероятностью в 30% что ничего не выпадет с него
+
+Хардсьюты:
+EDIT: `code/modules/clothing/spacesuits/hardsuit.dm`
+REMOVE: `code/modules/clothing/spacesuits/hardsuit.dm`
 <!--
   Если вы редактировали какие-либо процедуры или переменные в кор коде,
   они должны быть указаны здесь.

mod_celadon/balance/_balance.dme

@@ -17,6 +17,8 @@
 #include "code/gun.dm"
 #include "code/ionrifle.dm"
 #include "code/vending.dm"
+#include "code/gloves.dm"
+#include "code/hardsuit.dm"
 
 #include "../cargo_items/_cargo_items.dme"
 

mod_celadon/balance/code/gloves.dm

@@ -0,0 +1,12 @@
+/obj/item/clothing/gloves/explorer/old
+	armor = list("melee" = 25, "bullet" = 20, "laser" = 20, "energy" = 20, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)
+	siemens_coefficient = 0.3
+
+/obj/item/clothing/gloves/krav_maga/combatglovesplus
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 15, "energy" = 15, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)
+
+/obj/item/clothing/gloves/combat
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 15, "energy" = 15, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)
+
+/obj/item/clothing/gloves/tackler/combat/insulated
+	armor = list("melee" = 15, "bullet" = 10, "laser" = 15, "energy" = 15, "bomb" = 65, "bio" = 100, "rad" = 75, "fire" = 75, "acid" = 75)

mod_celadon/balance/code/hardsuit.dm

@@ -0,0 +1,2 @@
+/obj/item/clothing/suit/space/hardsuit/ert
+	slowdown = 0.3

mod_celadon/items/code/coats.dm

@@ -27,7 +27,7 @@
 	togglename = "zhan"
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
 	resistance_flags = NONE
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION
 
 /obj/item/clothing/suit/toggle/tajaran/naval_coat
 	icon = 'mod_celadon/_storge_icons/icons/items/obj/tajara_items.dmi'
@@ -41,7 +41,7 @@
 	togglename = "naval"
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
 	resistance_flags = NONE
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION
 
 /obj/item/clothing/suit/toggle/tajaran/med_coat
 	icon = 'mod_celadon/_storge_icons/icons/items/obj/tajara_items.dmi'
@@ -55,7 +55,7 @@
 	togglename = "naval"
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
 	resistance_flags = NONE
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION
 
 /obj/item/clothing/suit/hunting
 	icon = 'mod_celadon/_storge_icons/icons/items/obj/tajara_items.dmi'
@@ -67,4 +67,4 @@
 	blood_overlay_type = "coat"
 	body_parts_covered = CHEST | ARMS | GROIN
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION

mod_celadon/items/code/external_wears.dm

@@ -15,6 +15,6 @@
 					/obj/item/radio)
 	body_parts_covered = CHEST | GROIN | ARMS
 	cold_protection = CHEST |GROIN | ARMS
-	supports_variations = DIGITIGRADE_VARIATION | TAJARA_VARIATION
+	supports_variations = DIGITIGRADE_VARIATION
 	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
 	pocket_storage_component_path = /datum/component/storage/concrete/pockets/small