Custom items 02/12 (#5692)

Adds the following items:

-Stainless Steel Fork - Vedai'Kwia Xizal - conspiir
-Tokash Ancestral Spear - Suvek Tokash - evandorf
-Ghostly Board - Klavdiya Tikhomirov - alberyk
-Clawed Arm & Jacket - Diamond with Flaw - burgerbb

Removes make's antenna and change his coat to be a proper poncho.

This pra also has some changes, such as two bugfixes; one that prevents runtimes from adding new robotic limbs, and another that prevents dionaea arms from being regenerated if there is an arm present, and removing admin and species only related limbs from the fabricator, such as the hk limbs.

code/__defines/mobs.dm

@@ -223,6 +223,7 @@
 #define PROSTHETIC_ZH "Zeng-Hu Pharmaceuticals"
 #define PROSTHETIC_HI "Hephaestus Industries"
 #define PROSTHETIC_XMG "Xion Manufacturing Group"
+#define PROSTHETIC_DIONA "Unknown Model"
 
 //Brain Damage defines
 #define BRAIN_DAMAGE_MILD 10

code/datums/trading/goods.dm

@@ -147,7 +147,6 @@
 		/obj/item/clothing/under/dress/fluff                     = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/under/rank/centcom_officer/bst        = TRADER_BLACKLIST,
 		/obj/item/clothing/suit/storage/hooded                   = TRADER_SUBTYPES_ONLY,
-		/obj/item/clothing/suit/storage/hooded/fluff             = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/suit/storage/hooded/wintercoat/fluff  = TRADER_BLACKLIST_ALL,
 		/obj/item/clothing/suit/storage/toggle/labcoat           = TRADER_ALL,
 		/obj/item/clothing/suit/storage/toggle/labcoat/fluff     = TRADER_BLACKLIST_ALL,

code/game/mecha/mech_fabricator.dm

@@ -106,10 +106,10 @@
 	data["buildable"] = get_build_options()
 	data["category"] = category
 	data["categories"] = categories
-	if(all_robolimbs)
+	if(chargen_robolimbs )
 		var/list/T = list()
-		for(var/A in all_robolimbs)
-			var/datum/robolimb/R = all_robolimbs[A]
+		for(var/A in chargen_robolimbs )
+			var/datum/robolimb/R = chargen_robolimbs [A]
 			T += list(list("id" = A, "company" = R.company))
 		data["manufacturers"] = T
 		data["manufacturer"] = manufacturer
@@ -141,7 +141,7 @@
 			category = href_list["category"]
 
 	if(href_list["manufacturer"])
-		if(href_list["manufacturer"] in all_robolimbs)
+		if(href_list["manufacturer"] in chargen_robolimbs )
 			manufacturer = href_list["manufacturer"]
 
 	if(href_list["eject"])

code/modules/customitems/item_defines.dm

@@ -1009,6 +1009,7 @@ All custom items with worn sprites must follow the contained sprite system: http
 	icon_state = "flaming_poncho"
 	item_state = "flaming_poncho"
 	contained_sprite = TRUE
+	icon_override = FALSE
 
 
 /obj/item/clothing/accessory/badge/fluff/jane_badge //Tarnished Badge - Jane Pyre - somethingvile
@@ -1073,14 +1074,6 @@ All custom items with worn sprites must follow the contained sprite system: http
 	item_state = "make_beret"
 	contained_sprite = TRUE
 
-/obj/item/device/radio/headset/fluff/make_antenna //Antenna - M.A.K.E - toasterstrudes
-	name = "antenna"
-	desc = "An antenna attachment that can be screwed into the side of an IPC's head. It looks to have radio functions."
-	icon = 'icons/obj/custom_items/make_items.dmi'
-	icon_state = "make_antenna"
-	item_state = "make_antenna"
-	contained_sprite = TRUE
-
 
 /obj/item/clothing/mask/fluff/corvo_cigarette //Vaporizer Pen - Nathan Corvo - jkjudgex
 	name = "vaporizer pen"
@@ -1852,18 +1845,14 @@ All custom items with worn sprites must follow the contained sprite system: http
 	light_color = LIGHT_COLOR_BLUE
 
 
-obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A.K.E - toasterstrudes
+/obj/item/clothing/accessory/poncho/fluff/make_poncho //Raincoat Poncho - M.A.K.E - toasterstrudes
 	name = "raincoat poncho"
 	desc = "A tough brown hooded poncho that looks to be good at protecting someone from the rain."
 	icon = 'icons/obj/custom_items/make_items.dmi'
 	icon_state = "make_poncho"
 	item_state = "make_poncho"
 	contained_sprite = TRUE
-	hoodtype = /obj/item/clothing/head/winterhood/fluff/make_hood
-	body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS
-
-/obj/item/clothing/head/winterhood/fluff/make_hood
-	flags_inv = HIDEEARS
+	icon_override = FALSE
 
 
 /obj/item/clothing/under/fluff/aegis_uniform //Hephaestus Experimental Projector - Sovereign Aegis - itanimulli
@@ -2399,4 +2388,87 @@ obj/item/clothing/suit/storage/hooded/fluff/make_poncho //Raincoat Poncho - M.A.
 	icon = 'icons/obj/custom_items/ryn_clothing.dmi'
 	icon_state = "ryn_hood"
 	item_state = "ryn_hood"
-	contained_sprite = TRUE
+	contained_sprite = TRUE
+
+
+/obj/item/weapon/material/kitchen/utensil/fork/fluff/vedai_fork //Stainless Steel Fork - Vedai'Kwia Xizal - conspiir
+	desc = "A stainless steel fork. The word \"Kwia\" is engraved on the back of the handle."
+	icon = 'icons/obj/custom_items/vedai_fork.dmi'
+	icon_state = "vedai_fork"
+	applies_material_colour = FALSE
+
+/obj/item/weapon/material/kitchen/utensil/fork/fluff/vedai_fork/set_material(var/new_material)
+	..()
+	name = "stainless [material.display_name] [initial(name)]"
+
+
+/obj/item/sign/fluff/tokash_sign //Tokash Ancestral Spear - Suvek Tokash - evandorf
+	name = "ancestral spear"
+	desc = "This spear is clearly very old but well cared for."
+	icon_state = "tokash_sign"
+	sign_state = "tokash_sign"
+	w_class = 2
+
+
+/obj/item/weapon/spirit_board/fluff/klavdiya_board //Ghostly Board - Klavdiya Tikhomirov - alberyk
+	name = "ghostly board"
+	desc = "An adhomian ghostly board, used in divination rituals. This one is blue and has the symbol of a moon on it."
+	icon = 'icons/obj/custom_items/klavdiya_amulet.dmi'
+	icon_state = "klavdiya_board" //thanks to kyres1 for the sprites
+
+
+/obj/item/clothing/suit/storage/fluff/diamond_jacket //Clawed Arm & Jacket - Diamond with Flaw - burgerbb
+	name = "torn chemistry jacket"
+	desc = "The entire left side of this perfectly good jacket was torn to shreds."
+	icon = 'icons/obj/custom_items/diamond_cloak.dmi'
+	icon_state = "diamond_chemjacket"
+	item_state = "diamond_chemjacket"
+	contained_sprite = TRUE
+
+/obj/item/organ/external/arm/industrial/fluff/dionaea_l_arm
+	robotize_type = PROSTHETIC_DIONA
+
+/obj/item/organ/external/hand/industrial/fluff/dionaea_l_hand
+	robotize_type = PROSTHETIC_DIONA
+
+/datum/robolimb/fluff/dionaea
+	company = PROSTHETIC_DIONA
+	desc = "This limb is covered in a strange formation of metal and organic matter."
+	icon = 'icons/mob/human_races/r_ind_diona.dmi'
+	linked_frame = "Unknown Entity"
+	species_can_use = list("Diona")
+	unavailable_at_chargen = TRUE
+
+/obj/item/fluff/dionaea_arm
+	name = "strange arm"
+	desc = "Is that mold?"
+	icon = 'icons/mob/human_races/r_ind_diona.dmi'
+	icon_state = "preview"
+
+/obj/item/fluff/dionaea_arm/attack_self(mob/user)
+	if(user.ckey != "burgerbb" || !ishuman(user))
+		to_chat(user,span("notice","You can't seem to figure out what to do with this."))
+		return
+
+	var/mob/living/carbon/human/H = user
+	if(!H.is_diona())
+		to_chat(user,span("notice","It looks strangely familiar..."))
+		return
+
+	var/obj/item/organ/external/OL = H.get_organ("l_arm")
+	var/obj/item/organ/external/arm/industrial/fluff/dionaea_l_arm/NA = new(get_turf(src))
+	var/obj/item/organ/external/hand/industrial/fluff/dionaea_l_hand/NH = new(get_turf(src))
+
+	if(OL)
+		qdel(OL)
+
+	if(NA)
+		NA.replaced(H)
+		if(NH)
+			NH.replaced(H)
+		H.update_body()
+		H.updatehealth()
+		H.UpdateDamageIcon()
+
+	H.drop_from_inventory(src)
+	qdel(src)

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

@@ -272,6 +272,8 @@ var/list/diona_banned_languages = list(
 		//We will only replace ONE organ or limb each time this procs
 		var/path
 		for (var/i in species.has_limbs)
+			if(organs_by_name[i]) //Allow arm transplants + cyborg limbs
+				continue
 			path = species.has_limbs[i]["path"]
 			var/limb_exists = 0
 			for (var/obj/item/organ/external/B in organs)

code/modules/organs/organ_external.dm

@@ -190,6 +190,10 @@
 
 /obj/item/organ/external/replaced(var/mob/living/carbon/human/target)
 	owner = target
+	if(!species)
+		species = owner.species
+	if(!dna)
+		dna = owner.dna
 	forceMove(owner)
 	if(istype(owner))
 		owner.organs_by_name[limb_name] = src