Merge remote-tracking branch 'citadel/master' into mobility_flags

code/modules/mining/equipment/explorer_gear.dm

@@ -14,7 +14,7 @@
 	flags_inv = HIDEJUMPSUIT|HIDETAUR
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
 	resistance_flags = FIRE_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 
 
 /obj/item/clothing/head/hooded/explorer
@@ -29,6 +29,7 @@
 	resistance_flags = FIRE_PROOF
 
 /obj/item/clothing/suit/hooded/explorer/standard
+	hoodtype = /obj/item/clothing/head/hooded/explorer/standard
 
 /obj/item/clothing/head/hooded/explorer/standard
 
@@ -70,7 +71,7 @@
 	clothing_flags = THICKMATERIAL //not spaceproof
 	max_heat_protection_temperature = FIRE_IMMUNITY_MAX_TEMP_PROTECT
 	resistance_flags = FIRE_PROOF | LAVA_PROOF
-	tauric = TRUE		//Citadel Add for tauric hardsuits
+	mutantrace_variation = STYLE_DIGITIGRADE|STYLE_SNEK_TAURIC|STYLE_PAW_TAURIC
 	slowdown = 0
 	armor = list("melee" = 70, "bullet" = 40, "laser" = 10, "energy" = 10, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
 	allowed = list(/obj/item/flashlight, /obj/item/tank/internals, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe)
@@ -116,7 +117,7 @@
 	glass_overlay.appearance_flags = RESET_COLOR
 	add_overlay(glass_overlay)
 
-/obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(isinhands)
+/obj/item/clothing/head/helmet/space/hostile_environment/worn_overlays(isinhands, icon_file, style_flags = NONE)
 	. = ..()
 	if(!isinhands)
 		var/mutable_appearance/M = mutable_appearance('icons/mob/head.dmi', "hostile_env_glass")

code/modules/mining/equipment/kinetic_crusher.dm

@@ -29,6 +29,15 @@
 	var/light_on = FALSE
 	var/brightness_on = 7
 
+/obj/item/twohanded/kinetic_crusher/cyborg //probably give this a unique sprite later
+	desc = "An integrated version of the standard kinetic crusher with a grinded down axe head to dissuade mis-use against crewmen. Deals damage equal to the standard crusher against creatures, however."
+	force = 10 //wouldn't want to give a borg a 20 brute melee weapon unemagged now would we
+	detonation_damage = 60
+	wielded = 1
+
+/obj/item/twohanded/kinetic_crusher/cyborg/unwield()
+	return
+
 /obj/item/twohanded/kinetic_crusher/Initialize()
 	. = ..()
 	AddComponent(/datum/component/butchering, 60, 110) //technically it's huge and bulky, but this provides an incentive to use it

code/modules/mining/equipment/mining_tools.dm

@@ -1,137 +1,154 @@
-/*****************Pickaxes & Drills & Shovels****************/
-/obj/item/pickaxe
-	name = "pickaxe"
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "pickaxe"
-	flags_1 = CONDUCT_1
-	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
-	force = 15
-	throwforce = 10
-	item_state = "pickaxe"
-	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
-	w_class = WEIGHT_CLASS_BULKY
-	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
-	tool_behaviour = TOOL_MINING
-	toolspeed = 1
-	usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
-	attack_verb = list("hit", "pierced", "sliced", "attacked")
-
-/obj/item/pickaxe/suicide_act(mob/living/user)
-	user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	if(use_tool(user, user, 30, volume=50))
-		return BRUTELOSS
-	user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
-	return SHAME
-
-/obj/item/pickaxe/mini
-	name = "compact pickaxe"
-	desc = "A smaller, compact version of the standard pickaxe."
-	icon_state = "minipick"
-	force = 10
-	throwforce = 7
-	slot_flags = ITEM_SLOT_BELT
-	w_class = WEIGHT_CLASS_SMALL
-	materials = list(MAT_METAL=1000)
-
-/obj/item/pickaxe/silver
-	name = "silver-plated pickaxe"
-	icon_state = "spickaxe"
-	item_state = "spickaxe"
-	toolspeed = 0.5 //mines faster than a normal pickaxe, bought from mining vendor
-	desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
-	force = 17
-	materials = list(MAT_SILVER=4000)
-
-/obj/item/pickaxe/diamond
-	name = "diamond-tipped pickaxe"
-	icon_state = "dpickaxe"
-	item_state = "dpickaxe"
-	toolspeed = 0.3
-	desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
-	force = 19
-	materials = list(MAT_DIAMOND=4000)
-
-/obj/item/pickaxe/drill
-	name = "mining drill"
-	icon_state = "handdrill"
-	item_state = "jackhammer"
-	slot_flags = ITEM_SLOT_BELT
-	toolspeed = 0.6 //available from roundstart, faster than a pickaxe.
-	usesound = 'sound/weapons/drill.ogg'
-	hitsound = 'sound/weapons/drill.ogg'
-	desc = "An electric mining drill for the especially scrawny."
-
-/obj/item/pickaxe/drill/cyborg
-	name = "cyborg mining drill"
-	desc = "An integrated electric mining drill."
-	flags_1 = NONE
-
-/obj/item/pickaxe/drill/cyborg/Initialize()
-	. = ..()
-	ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
-
-/obj/item/pickaxe/drill/diamonddrill
-	name = "diamond-tipped mining drill"
-	icon_state = "diamonddrill"
-	toolspeed = 0.2
-	desc = "Yours is the drill that will pierce the heavens!"
-
-/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
-	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics.
-	icon_state = "diamonddrill"
-	toolspeed = 0.1
-
-/obj/item/pickaxe/drill/jackhammer
-	name = "sonic jackhammer"
-	icon_state = "jackhammer"
-	item_state = "jackhammer"
-	w_class = WEIGHT_CLASS_HUGE
-	toolspeed = 0.1 //the epitome of powertools. extremely fast mining, laughs at puny walls
-	usesound = 'sound/weapons/sonic_jackhammer.ogg'
-	hitsound = 'sound/weapons/sonic_jackhammer.ogg'
-	desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
-
-/obj/item/shovel
-	name = "shovel"
-	desc = "A large tool for digging and moving dirt."
-	icon = 'icons/obj/mining.dmi'
-	icon_state = "shovel"
-	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
-	flags_1 = CONDUCT_1
-	slot_flags = ITEM_SLOT_BELT
-	force = 8
-	tool_behaviour = TOOL_SHOVEL
-	toolspeed = 0.1 //Can only dig ash and thats about it, out classed by the picks and drills no more!
-	usesound = 'sound/effects/shovel_dig.ogg'
-	throwforce = 4
-	item_state = "shovel"
-	w_class = WEIGHT_CLASS_NORMAL
-	materials = list(MAT_METAL=350)
-	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
-	sharpness = IS_SHARP
-
-/obj/item/shovel/Initialize()
-	. = ..()
-	AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely.
-
-/obj/item/shovel/suicide_act(mob/living/user)
-	user.visible_message("<span class='suicide'>[user] begins digging their own grave!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
-	if(use_tool(user, user, 30, volume=50))
-		return BRUTELOSS
-	user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
-	return SHAME
-
-/obj/item/shovel/spade
-	name = "spade"
-	desc = "A small tool for digging and moving dirt."
-	icon_state = "spade"
-	item_state = "spade"
-	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
-	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
-	toolspeed = 0.5
-	force = 5
-	throwforce = 7
-	materials = list(MAT_METAL=50)
-	w_class = WEIGHT_CLASS_SMALL
+/*****************Pickaxes & Drills & Shovels****************/
+/obj/item/pickaxe
+	name = "pickaxe"
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "pickaxe"
+	flags_1 = CONDUCT_1
+	slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
+	force = 15
+	throwforce = 10
+	item_state = "pickaxe"
+	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
+	w_class = WEIGHT_CLASS_BULKY
+	materials = list(MAT_METAL=2000) //one sheet, but where can you make them?
+	tool_behaviour = TOOL_MINING
+	toolspeed = 1
+	usesound = list('sound/effects/picaxe1.ogg', 'sound/effects/picaxe2.ogg', 'sound/effects/picaxe3.ogg')
+	attack_verb = list("hit", "pierced", "sliced", "attacked")
+	var/digrange = 1
+
+/obj/item/pickaxe/attack_self(mob/user)
+	if(initial(digrange) > 0)
+		if(digrange == 0)
+			digrange = initial(digrange)
+			toolspeed = initial(toolspeed)
+			to_chat(user, "<span class='notice'>You increase the tools dig range, decreasing its mining speed.</span>")
+		else
+			digrange = 0
+			toolspeed = toolspeed/2
+			to_chat(user, "<span class='notice'>You decrease the tools dig range, increasing its mining speed.</span>")
+	else
+		to_chat(user, "<span class='notice'>Tool does not have a configureable dig range.</span>")
+
+/obj/item/pickaxe/suicide_act(mob/living/user)
+	user.visible_message("<span class='suicide'>[user] begins digging into [user.p_their()] chest!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	if(use_tool(user, user, 30, volume=50))
+		return BRUTELOSS
+	user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
+	return SHAME
+
+/obj/item/pickaxe/mini
+	name = "compact pickaxe"
+	desc = "A smaller, compact version of the standard pickaxe."
+	icon_state = "minipick"
+	force = 10
+	throwforce = 7
+	slot_flags = ITEM_SLOT_BELT
+	w_class = WEIGHT_CLASS_SMALL
+	materials = list(MAT_METAL=1000)
+
+/obj/item/pickaxe/silver
+	name = "silver-plated pickaxe"
+	icon_state = "spickaxe"
+	item_state = "spickaxe"
+	toolspeed = 0.5 //mines faster than a normal pickaxe, bought from mining vendor
+	desc = "A silver-plated pickaxe that mines slightly faster than standard-issue."
+	force = 17
+	materials = list(MAT_SILVER=4000)
+
+/obj/item/pickaxe/diamond
+	name = "diamond-tipped pickaxe"
+	icon_state = "dpickaxe"
+	item_state = "dpickaxe"
+	toolspeed = 0.3
+	desc = "A pickaxe with a diamond pick head. Extremely robust at cracking rock walls and digging up dirt."
+	force = 19
+	materials = list(MAT_DIAMOND=4000)
+
+/obj/item/pickaxe/drill
+	name = "mining drill"
+	icon_state = "handdrill"
+	item_state = "jackhammer"
+	slot_flags = ITEM_SLOT_BELT
+	toolspeed = 0.6 //available from roundstart, faster than a pickaxe.
+	usesound = 'sound/weapons/drill.ogg'
+	hitsound = 'sound/weapons/drill.ogg'
+	desc = "An electric mining drill for the especially scrawny."
+
+/obj/item/pickaxe/drill/cyborg
+	name = "cyborg mining drill"
+	desc = "An integrated electric mining drill."
+	flags_1 = NONE
+	toolspeed = 0.5
+
+/obj/item/pickaxe/drill/cyborg/Initialize()
+	. = ..()
+	ADD_TRAIT(src, TRAIT_NODROP, CYBORG_ITEM_TRAIT)
+
+/obj/item/pickaxe/drill/diamonddrill
+	name = "diamond-tipped mining drill"
+	icon_state = "diamonddrill"
+	toolspeed = 0.4
+	desc = "Yours is the drill that will pierce the heavens!"
+
+/obj/item/pickaxe/drill/cyborg/diamond //This is the BORG version!
+	name = "diamond-tipped cyborg mining drill" //To inherit the NODROP_1 flag, and easier to change borg specific drill mechanics.
+	icon_state = "diamonddrill"
+	toolspeed = 0.4
+	digrange = 2
+
+/obj/item/pickaxe/drill/jackhammer
+	name = "sonic jackhammer"
+	icon_state = "jackhammer"
+	item_state = "jackhammer"
+	w_class = WEIGHT_CLASS_HUGE
+	toolspeed = 0.2 //the epitome of powertools. extremely fast mining, laughs at puny walls
+	usesound = 'sound/weapons/sonic_jackhammer.ogg'
+	hitsound = 'sound/weapons/sonic_jackhammer.ogg'
+	desc = "Cracks rocks with sonic blasts, and doubles as a demolition power tool for smashing walls."
+	digrange = 2
+
+/obj/item/shovel
+	name = "shovel"
+	desc = "A large tool for digging and moving dirt."
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "shovel"
+	lefthand_file = 'icons/mob/inhands/equipment/mining_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/mining_righthand.dmi'
+	flags_1 = CONDUCT_1
+	slot_flags = ITEM_SLOT_BELT
+	force = 8
+	tool_behaviour = TOOL_SHOVEL
+	toolspeed = 0.1 //Can only dig ash and thats about it, out classed by the picks and drills no more!
+	usesound = 'sound/effects/shovel_dig.ogg'
+	throwforce = 4
+	item_state = "shovel"
+	w_class = WEIGHT_CLASS_NORMAL
+	materials = list(MAT_METAL=350)
+	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")
+	sharpness = IS_SHARP
+
+/obj/item/shovel/Initialize()
+	. = ..()
+	AddComponent(/datum/component/butchering, 150, 40) //it's sharp, so it works, but barely.
+
+/obj/item/shovel/suicide_act(mob/living/user)
+	user.visible_message("<span class='suicide'>[user] begins digging their own grave!  It looks like [user.p_theyre()] trying to commit suicide!</span>")
+	if(use_tool(user, user, 30, volume=50))
+		return BRUTELOSS
+	user.visible_message("<span class='suicide'>[user] couldn't do it!</span>")
+	return SHAME
+
+/obj/item/shovel/spade
+	name = "spade"
+	desc = "A small tool for digging and moving dirt."
+	icon_state = "spade"
+	item_state = "spade"
+	lefthand_file = 'icons/mob/inhands/equipment/hydroponics_lefthand.dmi'
+	righthand_file = 'icons/mob/inhands/equipment/hydroponics_righthand.dmi'
+	toolspeed = 0.5
+	force = 5
+	throwforce = 7
+	materials = list(MAT_METAL=50)
+	w_class = WEIGHT_CLASS_SMALL

code/modules/mining/equipment/regenerative_core.dm

@@ -74,6 +74,9 @@
 		if(inert)
 			to_chat(user, "<span class='notice'>[src] has decayed and can no longer be used to heal.</span>")
 			return
+		if(isvamp(user))
+			to_chat(user, "<span class='notice'>[src] breaks down as it fails to heal your unholy self</span>")
+			return
 		else
 			if(H.stat == DEAD)
 				to_chat(user, "<span class='notice'>[src] are useless on the dead.</span>")