Merge pull request #1025 from lmenvs/donoitems012224

Donator items 012224

code/modules/mob/living/basic/vermin/butterfly.dm

@@ -24,14 +24,16 @@
 	mob_biotypes = MOB_ORGANIC | MOB_BUG
 	gold_core_spawnable = FRIENDLY_SPAWN
 
+	var/fixed_color = FALSE //monkestation edit - for fixed butterfly colors
 	ai_controller = /datum/ai_controller/basic_controller/butterfly
 
 /mob/living/basic/butterfly/Initialize(mapload)
 	. = ..()
 	AddElement(/datum/element/simple_flying)
 
-	var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
-	add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
+	if(!fixed_color) //monkestation edit - for fixed butterfly colors
+		var/newcolor = rgb(rand(0, 255), rand(0, 255), rand(0, 255))
+		add_atom_colour(newcolor, FIXED_COLOUR_PRIORITY)
 	ADD_TRAIT(src, TRAIT_VENTCRAWLER_ALWAYS, INNATE_TRAIT)
 	AddElement(/datum/element/swabable, CELL_LINE_TABLE_BUTTERFLY, CELL_VIRUS_TABLE_GENERIC_MOB, cell_line_amount = 1, virus_chance = 5)
 

monkestation/code/modules/donator/code/datum/loadout.dm

@@ -253,4 +253,36 @@
 	item_path = /obj/item/clothing/head/costume/zed_officercap
 	donator_only = TRUE
 	requires_purchase = FALSE
-	ckeywhitelist = list("zedmastermind")
+
+//tonymcp
+
+/datum/loadout_item/mask/igor
+	name = "Igor Mask"
+	item_path = /obj/item/clothing/mask/igor
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/suit/violet_jacket
+	name = "Violet's Phantom Thief Jacket"
+	item_path = /obj/item/clothing/suit/costume/violet_jacket
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/toys/puppycat
+	name = "Jack Frost Plush"
+	item_path = /obj/item/toy/plush/jackfrost
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/pocket_items/donator/void_butterfly
+	name = "Pet Delivery Beacon - Void Butterfly"
+	item_path = /obj/item/choice_beacon/pet/donator/void_butterfly
+	donator_only = TRUE
+	requires_purchase = FALSE
+	ckeywhitelist = list("tonymcsp")
+
+/datum/loadout_item/effects/void_butterfly
+	ckeywhitelist = list("tonymcsp")
+	name = "Void Butterfly Transformation"
+	item_path = /obj/item/effect_granter/donator/void_butterfly/
+	requires_purchase = FALSE

monkestation/code/modules/donator/code/item/choice_beacon.dm

@@ -66,3 +66,7 @@
 	default_name = "German Shepherd"
 	donator_pet = 	/mob/living/basic/pet/dog/germanshepherd
 
+/obj/item/choice_beacon/pet/donator/void_butterfly
+	name = "Void Butterfly"
+	default_name = "Void Butterfly"
+	donator_pet = 	/mob/living/basic/butterfly/void/spacial

monkestation/code/modules/donator/code/item/clothing.dm

@@ -213,3 +213,21 @@
 	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
 	icon_state = "zed_officercap"
 	inhand_icon_state = null
+
+/obj/item/clothing/mask/igor
+	name = "\improper Igor Mask"
+	desc = "A mask that resembles a peculiar man named Igor."
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "igor_mask"
+	inhand_icon_state = null
+	flags_inv = HIDEFACE
+
+/obj/item/clothing/suit/costume/violet_jacket
+	name = "\improper Violet's Jacket"
+	desc = "A jacket resembling the outfit worn by the Phantom Thief known as Violet."
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "violet_jacket"
+	inhand_icon_state = null
+	body_parts_covered = CHEST|ARMS

monkestation/code/modules/donator/code/item/effects.dm

@@ -57,3 +57,10 @@
 	name = "Spycrab transformation"
 	icon_state = "crab_red"
 	animal_transformation = /mob/living/basic/crab/spycrab
+
+//tonymcp
+
+/obj/item/effect_granter/donator/void_butterfly
+	name = "void butterfly transformation"
+	icon_state = "void_butterfly"
+	animal_transformation = /mob/living/basic/butterfly/void/spacial

monkestation/code/modules/donator/code/item/plush.dm

@@ -49,3 +49,9 @@
 	desc = "A plush of a hotdog. ~Handcrafted lovingly for Spinnermaster."
 	icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
 	icon_state = "hotdog"
+
+/obj/item/toy/plush/jackfrost
+	name = "jack frost plush"
+	desc = "A plush of Jack Frost. ~Handcrafted lovingly for tonymcsp"
+	icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+	icon_state = "jack_frost"

monkestation/code/modules/donator/code/mob/pets.dm

@@ -112,3 +112,17 @@
 	icon_dead = "spider_dead"
 	gold_core_spawnable = NO_SPAWN
 	ai_controller = /datum/ai_controller/basic_controller/
+
+/mob/living/basic/butterfly/void
+	name = "Void Butterfly"
+	desc = "They say if a void butterfly flaps its wings..."
+	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
+	icon_state = "void_butterfly"
+	icon_living = "void_butterfly"
+	icon_dead = "void_butterfly_dead"
+	gold_core_spawnable = NO_SPAWN
+	health = 20
+	maxHealth = 20
+
+/mob/living/basic/butterfly/void/spacial
+	fixed_color = TRUE

strings/pill_names.json

@@ -116,7 +116,6 @@
 "Ian",
 "Ice",
 "Jumper",
-"Kat",
 "Kilgor",
 "Lettuce",
 "Lightning",
@@ -210,6 +209,7 @@
 "Turbo",
 "Tweak",
 "Uppers",
+"Velvet",
 "Vitamin",
 "Voodoo",
 "Vorpal",