[TM] ADD: MODsuits на Целадон-ШИПтест-Локалка

code/__DEFINES/mod.dm

@@ -2,7 +2,7 @@
 #define DEFAULT_MAX_COMPLEXITY 15
 
 /// Default cell drain per process on MODsuits
-#define DEFAULT_CHARGE_DRAIN 0.09
+#define DEFAULT_CHARGE_DRAIN 10 // [CELADON-EDIT] - CELADON_MODSUITS - Пиздатейший фикс. На тг 5, пусть у нас 10, посмотрим как играться будет //#define DEFAULT_CHARGE_DRAIN 0.09
 
 #define MODULE_CHARGE_DRAIN_LOW 5
 #define MODULE_CHARGE_DRAIN_MEDIUM 10

code/controllers/subsystem/processing/quirks.dm

@@ -39,6 +39,7 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 
 	species_blacklist = list(
 		"Blood Deficiency" = list(SPECIES_IPC, SPECIES_JELLYPERSON, SPECIES_PLASMAMAN, SPECIES_VAMPIRE),
+		"Dwarfism" = list(SPECIES_IPC, SPECIES_KEPORI, SPECIES_VOX, SPECIES_RACHNID),	// [CELADON-ADD] - NO_FUN_ALLOWED_SPECIES
 		"Alcohol Tolerance" = list(SPECIES_IPC, SPECIES_PLASMAMAN),
 		"Light Drinker" = list(SPECIES_IPC, SPECIES_PLASMAMAN),
 		"Smoker" = list(SPECIES_IPC, SPECIES_PLASMAMAN),

code/game/objects/items.dm

@@ -649,6 +649,9 @@ GLOBAL_VAR_INIT(embedpocalypse, FALSE) // if true, all items will be able to emb
 			A.Grant(user)
 	item_flags |= IN_INVENTORY
 	SEND_SIGNAL(src, COMSIG_ITEM_EQUIPPED, user, slot)
+	//[CELADON-FIX] - CELADON_MODSUITS - Fixing MOD magnetic harness
+	SEND_SIGNAL(user, COMSIG_MOB_EQUIPPED_ITEM, src, slot)
+	//[/CELADON-FIX]
 	if(!initial)
 		if(equip_sound && (slot_flags & slot))
 			playsound(src, equip_sound, EQUIP_SOUND_VOLUME, TRUE, ignore_walls = FALSE)

code/modules/mob/inventory.dm

@@ -334,6 +334,9 @@
 			else
 				I.forceMove(newloc)
 		I.dropped(src, silent)
+	//[CELADON-FIX] - CELADON_MODSUITS - fixing MOD magnetic harness.
+	SEND_SIGNAL(src, COMSIG_MOB_UNEQUIPPED_ITEM, I, force, newloc, no_move, invdrop, silent)
+	//[/CELADON-FIX]
 	return TRUE
 
 //Outdated but still in use apparently. This should at least be a human proc.

code/modules/mob/living/carbon/carbon_defense.dm

@@ -839,6 +839,7 @@
 /mob/living/carbon/bullet_act(obj/projectile/P, def_zone, piercing_hit = FALSE)
 	if(check_concealment(P))
 		return BULLET_ACT_FORCE_PIERCE
+	SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone) // [CELADON-ADD] - CELADON-MODSUITS
 	var/armor = run_armor_check(def_zone, P.flag, P.armour_penetration, silent = TRUE)
 	var/on_hit_state = P.on_hit(src, armor, piercing_hit)
 	if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK && !QDELETED(src)) //QDELETED literally just for the instagib rifle. Yeah.

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

@@ -63,6 +63,11 @@
 			if(!(martial_art_result == BULLET_ACT_HIT))
 				return martial_art_result
 
+	//[CELADON-FIX] - CELADON_MODSUITS - Actually adding signals, officials ported with MODs
+	if(SEND_SIGNAL(src, COMSIG_HUMAN_CHECK_SHIELDS, src, P) & SHIELD_BLOCK)
+		return BULLET_ACT_FORCE_PIERCE
+	//[/CELADON-FIX]
+
 	if(!(P.original == src && P.firer == src)) //can't block or reflect when shooting yourself
 		if(P.reflectable & REFLECT_NORMAL)
 			if(check_reflect(def_zone)) // Checks if you've passed a reflection% check
@@ -174,7 +179,10 @@
 		throwpower = I.throwforce
 		if(I.thrownby == WEAKREF(src)) //No throwing stuff at yourself to trigger hit reactions
 			return ..()
-	if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
+	//[CELADON-EDIT] - CELADON_MODSUITS - Actually adding signals for energy shield
+	//if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK))
+	if(check_shields(AM, throwpower, "\the [AM.name]", THROWN_PROJECTILE_ATTACK) || (SEND_SIGNAL(src, COMSIG_HUMAN_CHECK_SHIELDS, src, AM) & SHIELD_BLOCK))
+	//[/CELADON-EDIT]
 		hitpush = FALSE
 		skipcatch = TRUE
 		blocked = TRUE

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

@@ -993,7 +993,7 @@ GLOBAL_LIST_EMPTY(roundstart_races)
 			bodyparts_to_add -= "riol_ears"
 	// [/CELADON-ADD]
 
-	// [CELADON-ADD] - CELADON_ELZUOZE
+	// [CELADON-ADD] - CELADON_INTEQ_VENDOR - добавлена поддержка модами скрытия рогов Эльзоуз
 	if("tail_elzu" in mutant_bodyparts)
 		if(!H.dna.features["tail_elzu"] || H.dna.features["tail_elzu"] == "None" || H.wear_suit && (H.wear_suit.flags_inv & HIDEJUMPSUIT))
 			bodyparts_to_add -= "tail_elzu"

code/modules/mob/living/living_defense.dm

@@ -55,6 +55,7 @@
 		return BULLET_ACT_FORCE_PIERCE
 	var/armor = run_armor_check(def_zone, P.flag, P.armour_penetration, silent = TRUE)
 	var/on_hit_state = P.on_hit(src, armor, piercing_hit)
+	SEND_SIGNAL(src, COMSIG_ATOM_BULLET_ACT, P, def_zone) // [CELADON-ADD] - CELADON-MODSUITS
 	if(!P.nodamage && on_hit_state != BULLET_ACT_BLOCK && !QDELETED(src)) //QDELETED literally just for the instagib rifle. Yeah.
 		var/attack_direction = get_dir(P.starting, src)
 		apply_damage(P.damage, P.damage_type, def_zone, armor, wound_bonus=P.wound_bonus, bare_wound_bonus=P.bare_wound_bonus, sharpness = P.sharpness, attack_direction = attack_direction)

code/modules/mod/mod_clothes.dm

@@ -71,7 +71,7 @@
 	obj_flags = IMMUTABLE_SLOW
 	supports_variations = DIGITIGRADE_VARIATION
 	can_be_tied = FALSE
-	visor_flags_inv = HIDESHOES
+	// visor_flags_inv = HIDESHOES // [CELADON-DELETE] - CELADON_MODSUITS
 
 	equipping_sound = null
 	unequipping_sound = null

code/modules/mod/mod_construction.dm

@@ -225,6 +225,14 @@
 		if(SCREWED_ASSEMBLY_STEP)
 			if(istype(part, /obj/item/mod/construction/plating)) //Construct
 				var/obj/item/mod/construction/plating/external_plating = part
+				//[CELADON-ADD] - CELADON_MODSUITS
+				// I'm sorry. Я не умею кодить, увы
+				if(istype(part, /obj/item/mod/construction/plating/locked))
+					var/obj/item/mod/construction/plating/locked/locked_plating = part
+					if(!locked_plating.finished)
+						to_chat(user, span_notice("Нужно завершить сборку плит с помощью Modular power armor components."))
+						return
+				//[/CELADON-ADD]
 				if(!user.transferItemToLoc(part, src))
 					return
 				playsound(src, 'sound/machines/click.ogg', 30, TRUE)
@@ -236,7 +244,7 @@
 			else if(part.tool_behaviour == TOOL_SCREWDRIVER) //Construct
 				if(part.use_tool(src, user, 0, volume=30))
 					to_chat(user, span_notice("You unsecure the assembly."))
-					step = SCREWED_ASSEMBLY_STEP
+					step = WRENCHED_ASSEMBLY_STEP //[CELADON-FIX] - CELADON_MODSUITS // step = SCREWED_ASSEMBLY_STEP
 	update_icon_state()
 
 /obj/item/mod/construction/shell/update_icon_state()

code/modules/mod/mod_control.dm

@@ -389,7 +389,7 @@
 		return TRUE
 	else if(open && istype(attacking_item, /obj/item/stock_parts/cell) && istype(core, /obj/item/mod/core/standard))
 		var/obj/item/mod/core/standard/attacked_core = core
-		attacked_core.on_attackby(src, attacking_item, wearer)
+		attacked_core.on_attackby(src, attacking_item, user) //[CELADON-FIX] - CELADON_MODSUITS // attacked_core.on_attackby(src, attacking_item, wearer)
 		return TRUE
 	return ..()
 
@@ -416,10 +416,16 @@
 	if(!active || !wearer)
 		return
 	to_chat(wearer, span_notice("[severity > 1 ? "Light" : "Strong"] electromagnetic pulse detected!"))
+	// [CELADON-ADD] - CELADON_MODSUITS - Добавляем замедление при слабом ЕМП
+	if(!wearer.has_movespeed_modifier(/datum/movespeed_modifier/shove))
+		to_chat(wearer, span_danger("The [src] stiffens and its servos weaken, slowing you down!"))
+		wearer.add_movespeed_modifier(/datum/movespeed_modifier/shove) //  maybe define a slightly more severe/longer slowdown for this
+		addtimer(CALLBACK(wearer, TYPE_PROC_REF(/mob/living/carbon, clear_shove_slowdown)), SHOVE_SLOWDOWN_LENGTH * 4) // 12 секунд
+	// [/CELADON-ADD]
 	if(. & EMP_PROTECT_CONTENTS)
 		return
 	selected_module?.on_deactivation(display_message = TRUE)
-	wearer.apply_damage(10 / severity, BURN, spread_damage=TRUE)
+	wearer.apply_damage(20 / severity, BURN, spread_damage=TRUE) //[CELADON-EDIT] - CELADON_MODSUITS // wearer.apply_damage(10 / severity, BURN, spread_damage=TRUE)
 	to_chat(wearer, span_danger("You feel [src] heat up from the EMP, burning you slightly."))
 	if(wearer.stat < UNCONSCIOUS && prob(10))
 		wearer.force_scream()
@@ -448,6 +454,7 @@
 
 /obj/item/mod/control/update_icon_state()
 	item_state = "[skin]-control[active ? "-sealed" : ""]"
+	icon_state = "[skin]-control[active ? "-sealed" : ""]" // [CELADON-ADD] - CELADON_MODSUITS - Icon_state fix
 	return ..()
 
 /obj/item/mod/control/proc/set_wearer(mob/user)
@@ -640,12 +647,12 @@
 		alternate_worn_layer = used_skin[CONTROL_LAYER]
 	var/list/skin_updating = mod_parts + src
 	for(var/obj/item/part as anything in skin_updating)
-		// [CELADON-EDIT] - inteq_vendor - REASSIGNING ICONS DIRECTORY
+		// [CELADON-EDIT] - CELADON_MODSUITS - REASSIGNING ICONS DIRECTORY
 		//part.icon = used_skin[MOD_ICON_OVERRIDE] || 'icons/obj/clothing/modsuit/mod_clothing.dmi' // [CELADON-EDIT] - ORIGINAL
 		//part.mob_overlay_icon = used_skin[MOD_WORN_ICON_OVERRIDE] || 'icons/mob/clothing/modsuit/mod_clothing.dmi' // [CELADON-EDIT] - ORIGINAL
 		part.icon = used_skin[MOD_ICON_OVERRIDE] || 'mod_celadon/_storage_icons/icons/items/clothing/mod_suit/mod_clothing.dmi'
 		part.mob_overlay_icon = used_skin[MOD_WORN_ICON_OVERRIDE] || 'mod_celadon/_storage_icons/icons/items/clothing/mod_suit/overlay/mod_clothing.dmi'
-		// [CELADON-EDIT]
+		// [/CELADON-EDIT]
 
 		part.icon_state = "[skin]-[part.base_icon_state]"
 	for(var/obj/item/clothing/part as anything in mod_parts)

code/modules/mod/mod_core.dm

@@ -8,6 +8,17 @@
 	righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
 	/// MOD unit we are powering.
 	var/obj/item/mod/control/mod
+	// [CELADON-FIX] - CELADON_MODSUITS
+	var/blacklisted_cell_types = list(
+		/obj/item/stock_parts/cell/gun,
+		)
+	// [/CELADON-FIX]
+
+// [CELADON-FIX] - CELADON_MODSUITS
+/obj/item/mod/core/Initialize(mapload)
+	. = ..()
+	blacklisted_cell_types = typecacheof(blacklisted_cell_types)
+// [/CELADON-FIX]
 
 /obj/item/mod/core/Destroy()
 	if(mod)
@@ -188,6 +199,9 @@
 	to_chat(user,span_notice("You remove the cell"))
 	playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)
 	var/obj/item/cell_to_move = cell
+	// [CELADON-FIX] - CELADON_MODSUITS - Теперь батарейки обновляют свое состояние
+	cell_to_move.update_appearance()
+	// [/CELADON-FIX]
 	cell_to_move.forceMove(drop_location())
 	user.put_in_hands(cell_to_move)
 	mod.update_charge_alert()
@@ -204,6 +218,12 @@
 			to_chat(user,span_warning("There's a cell already installed!"))
 			playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
 			return COMPONENT_NO_AFTERATTACK
+		// [CELADON-FIX] - CELADON_MODSITS - запрет оружейных батареек в модах
+		if(is_type_in_list(attacking_item, blacklisted_cell_types))
+			to_chat(user,span_warning("This cell is incompatible!"))
+			playsound(mod, 'sound/machines/scanbuzz.ogg', 25, TRUE, SILENCED_SOUND_EXTRARANGE)
+			return COMPONENT_NO_AFTERATTACK
+		// [/CELADON-FIX]
 		install_cell(attacking_item)
 		to_chat(user,span_notice("Cell installed"))
 		playsound(mod, 'sound/machines/click.ogg', 50, TRUE, SILENCED_SOUND_EXTRARANGE)