Merge branch 'master' into protean-rework

code/modules/organs/internal/augment.dm

@@ -28,7 +28,7 @@
 	var/radial_state = null	// Icon state for the augment's radial icon.
 
 	var/aug_cooldown = 30 SECONDS
-	var/last_activate = null
+	var/cooldown = null
 
 /obj/item/organ/internal/augment/Initialize()
 	. = ..()
@@ -59,8 +59,8 @@
 		return
 
 	if(aug_cooldown)
-		if(last_activate <= world.time + aug_cooldown)
-			last_activate = world.time
+		if(cooldown <= world.time)
+			cooldown = world.time + aug_cooldown
 		else
 			return
 

code/modules/organs/internal/augment/armmounted.dm

@@ -135,8 +135,8 @@
 		return
 
 	if(aug_cooldown)
-		if(last_activate <= world.time + aug_cooldown)
-			last_activate = world.time
+		if(cooldown <= world.time)
+			cooldown = world.time + aug_cooldown
 		else
 			return
 

code/modules/organs/internal/augment/bio.dm

@@ -93,8 +93,8 @@
 		return
 
 	if(aug_cooldown)
-		if(last_activate <= world.time + aug_cooldown)
-			last_activate = world.time
+		if(cooldown <= world.time)
+			cooldown = world.time + aug_cooldown
 		else
 			return
 

code/modules/organs/organ_external.dm

@@ -461,11 +461,12 @@
 		if("omni")src.heal_damage(repair_amount, repair_amount, 0, 1)
 
 	if(damage_desc)
+		var/fix_verb = (damage_amount > repair_amount) ? "patches" : "finishes patching"
 		if(user == src.owner)
 			var/datum/gender/T = gender_datums[user.get_visible_gender()]
-			user.visible_message("<b>\The [user]</b> patches [damage_desc] on [T.his] [src.name] with [tool].")
+			user.visible_message("<b>\The [user]</b> [fix_verb] [damage_desc] on [T.his] [src.name] with [tool].")
 		else
-			user.visible_message("<b>\The [user]</b> patches [damage_desc] on [owner]'s [src.name] with [tool].")
+			user.visible_message("<b>\The [user]</b> [fix_verb] [damage_desc] on [owner]'s [src.name] with [tool].")
 
 	return 1
 
@@ -1138,6 +1139,7 @@ Note that amputating the affected organ does in fact remove the infection from t
 			force_icon = R.icon
 			brute_mod *= R.robo_brute_mod
 			burn_mod *= R.robo_burn_mod
+			prosthetic_digi = R.can_be_digitigrade //CHOMPStation edit
 			if(R.lifelike)
 				robotic = ORGAN_LIFELIKE
 				name = "[initial(name)]"
@@ -1409,6 +1411,11 @@ Note that amputating the affected organ does in fact remove the infection from t
 			if(!istype(I,/obj/item/weapon/implant) && !istype(I,/obj/item/device/nif)) //VOREStation Add - NIFs
 				return 1
 
-/obj/item/organ/external/proc/is_hidden_by_tail()
+/obj/item/organ/external/proc/is_hidden_by_sprite_accessory(var/clothing_only = FALSE)			// Clothing only will mean the check should only be used in places where we want to hide clothing icon, not organ itself.
 	if(owner && owner.tail_style && owner.tail_style.hide_body_parts && (organ_tag in owner.tail_style.hide_body_parts))
 		return 1
+	if(clothing_only && markings.len)
+		for(var/M in markings)
+			var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
+			if(mark.hide_body_parts && (organ_tag in mark.hide_body_parts))
+				return 1

code/modules/organs/organ_icon.dm

@@ -81,6 +81,19 @@ var/global/list/limb_icon_cache = list()
 
 /obj/item/organ/external/proc/get_icon(var/skeletal)
 
+	for(var/M in markings)
+		var/datum/sprite_accessory/marking/mark = markings[M]["datum"]
+		if(mark.organ_override)
+			var/icon/mark_s = new/icon("icon" = mark.icon, "icon_state" = "[mark.icon_state]-[organ_tag]")
+			mob_icon = new /icon("icon" = mark.icon, "icon_state" = "blank")
+			mark_s.Blend(markings[M]["color"], mark.color_blend_mode) // VOREStation edit
+			mob_icon.Blend(mark_s, ICON_OVERLAY) //So when it's on your body, it has icons
+			icon_cache_key = "[M][markings[M]["color"]]"
+
+			dir = EAST
+			icon = mob_icon
+			return mob_icon
+
 	var/gender = "m"
 	if(owner && owner.gender == FEMALE)
 		gender = "f"

code/modules/organs/robolimbs_ch.dm

@@ -1,6 +1,40 @@
+/datum/robolimb
+	var/can_be_digitigrade = FALSE //maybe move this over into more of a "does this have a custom digitigrade sprite, and if so, what is its icon file/icon name in the limb's file" when someone can be bothered making them
+
 /datum/robolimb/valehoundhead
 	company = "VALE Hound- Head"
 	desc = "A VALE hound head meant for synthetics."
 	icon = 'icons/mob/human_races/cyberlimbs/vale/vale_head.dmi' //Sprited by: Skits
 	skin_tone = 1
-	parts = list(BP_HEAD)
+	parts = list(BP_HEAD)
+
+/datum/robolimb/dsi_tajaran
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_lizard
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_sergal
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_nevrean
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_vulpkanin
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_akula
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_spider
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_zorren
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_fennec
+	can_be_digitigrade = TRUE
+
+/datum/robolimb/dsi_teshari/New()
+	. = ..()
+	species_cannot_use -= SPECIES_PROTEAN

code/modules/organs/robolimbs_custom.dm

@@ -171,6 +171,7 @@ VS Edit - anyone can select these. */
 	species_cannot_use = GLOB.all_species.Copy()
 	species_cannot_use -= SPECIES_TESHARI //VOREStation add - let 'em be selected.
 	species_cannot_use -= SPECIES_CUSTOM //VOREStation add - let 'em be selected.
+	species_cannot_use -= SPECIES_PROTEAN //VOREStation add - let 'em be selected.
 	..()
 
 /obj/item/weapon/disk/limb/dsi_teshari

code/modules/organs/robolimbs_vr.dm

@@ -81,4 +81,20 @@ var/const/cyberbeast_monitor_styles = "blank=cyber_blank;\
 	monitor_styles = cyberbeast_monitor_styles
 
 /obj/item/weapon/disk/limb/cyber_beast
-	company = "Cyber Tech"
+	company = "Cyber Tech"
+
+/datum/robolimb/zenghu_glacier
+	company = "Zeng-Hu Glacier"
+	desc = "This limb has a rubbery white covering with visible seams."
+	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_glacier_main.dmi'
+	species_alternates = list(SPECIES_TAJ = "Zeng-Hu - Tajaran")
+	unavailable_to_build = 1
+	skin_tone = 1
+	modular_bodyparts = MODULAR_BODYPART_PROSTHETIC
+
+/datum/robolimb/zenghu_taj_glacier
+	company = "Zeng-Hu Glacier - Tajaran"
+	desc = "This limb has a rubbery white covering with visible seams."
+	icon = 'icons/mob/human_races/cyberlimbs/zenghu/zenghu_glacier_taj.dmi'
+	unavailable_to_build = 1
+	parts = list(BP_HEAD)