Merge pull request #462 from lmenvs/dono-items-101523

More Donator items

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

@@ -19,19 +19,18 @@
 	requires_purchase = FALSE
 	ckeywhitelist = list("bidlink2")
 
+/datum/loadout_item/effects/cirno
+	ckeywhitelist = list("bidlink2")
+	name = "Cirno Transformation"
+	item_path = /obj/item/effect_granter/donator/cirno
+	requires_purchase = FALSE
+
 //ttnt
 
 /datum/loadout_item/head/pot
 	name = "Dented Pot"
 	item_path = /obj/item/clothing/head/costume/pot
 
-/datum/loadout_item/pocket_items/donator/spycrab
-	name = "Pet Delivery Beacon - Spycrab"
-	item_path = /obj/item/choice_beacon/pet/donator/spycrab
-	donator_only = TRUE
-	requires_purchase = FALSE
-	ckeywhitelist = list("unknown")
-
 //spinnermaster
 
 /datum/loadout_item/pocket_items/donator/void_mothroach
@@ -41,12 +40,25 @@
 	requires_purchase = FALSE
 	ckeywhitelist = list("spinnermaster")
 
+/datum/loadout_item/effects/void_mothroach
+	ckeywhitelist = list("spinnermaster")
+	name = "Void Mothroach Transformation"
+	item_path = /obj/item/effect_granter/donator/void_mothroach
+	requires_purchase = FALSE
+
+
 /datum/loadout_item/suit/shark_costume
 	name = "Blahaj Costume"
 	item_path = /obj/item/clothing/suit/hooded/shark_costume
 	donator_only = TRUE
 	requires_purchase = FALSE
 
+/datum/loadout_item/toys/hotdog_plush
+	name = "Hotdog Plush"
+	item_path = /obj/item/toy/plush/hotdog
+	donator_only = TRUE
+	requires_purchase = FALSE
+
 //ruby_flamewing
 
 /datum/loadout_item/pocket_items/donator/blahaj
@@ -56,12 +68,18 @@
 	requires_purchase = FALSE
 	ckeywhitelist = list("ruby_flamewing")
 
-/datum/loadout_item/under/syndie_pajamas
+/datum/loadout_item/under/miscellaneous/syndie_pajamas
 	name = "Syndicate Pajamas"
 	item_path = /obj/item/clothing/under/costume/syndie_pajamas
 	donator_only = TRUE
 	requires_purchase = FALSE
 
+/datum/loadout_item/effects/blahaj
+	ckeywhitelist = list("ruby_flamewing")
+	name = "Blahaj Transformation"
+	item_path = /obj/item/effect_granter/donator/blahaj
+	requires_purchase = FALSE
+
 //happiestplane
 /datum/loadout_item/mask/zoro
 	name = "Zoro Mask"
@@ -70,7 +88,7 @@
 	requires_purchase = FALSE
 
 
-/datum/loadout_item/under/navy_uniform
+/datum/loadout_item/under/miscellaneous/navy_uniform
 	name = "Naval Officer Uniform"
 	item_path = /obj/item/clothing/under/costume/navy_uniform_gold
 	donator_only = TRUE
@@ -83,18 +101,32 @@
 	donator_only = TRUE
 	requires_purchase = FALSE
 
-/datum/loadout_item/head/cirno
+/datum/loadout_item/head/dark_hos
 	name = "Dark HoS Hat"
 	item_path = /obj/item/clothing/head/costume/dark_hos
 	donator_only = TRUE
 	requires_purchase = FALSE
 
 /datum/loadout_item/toys/seam_plush
-	name = "Puck Plush"
+	name = "Seam Plush"
 	item_path = /obj/item/toy/plush/seam
 	donator_only = TRUE
 	requires_purchase = FALSE
 
+/datum/loadout_item/pocket_items/donator/germanshepherd
+	name = "Pet Delivery Beacon - German Shepherd"
+	item_path = /obj/item/choice_beacon/pet/donator/germanshepherd
+	donator_only = TRUE
+	requires_purchase = FALSE
+	ckeywhitelist = list("mjolnir2")
+
+
+/datum/loadout_item/effects/germanshepherd
+	ckeywhitelist = list("mjolnir2")
+	name = "German Shepherd Transformation"
+	item_path = /obj/item/effect_granter/donator/germanshepherd
+	requires_purchase = FALSE
+
 //sammi
 /datum/loadout_item/toys/puck_plush
 	name = "Puck Plush"
@@ -118,3 +150,54 @@
 	item_path = /obj/item/toy/plush/spider
 	donator_only = TRUE
 	requires_purchase = FALSE
+
+/datum/loadout_item/pocket_items/donator/spider
+	name = "Pet Delivery Beacon - Dancing Spider"
+	item_path = /obj/item/choice_beacon/pet/donator/spider
+	donator_only = TRUE
+	requires_purchase = FALSE
+	ckeywhitelist = list("Random516")
+
+/datum/loadout_item/neck/whitebeard
+	name = "Whitebeard's cloak"
+	item_path = /obj/item/clothing/neck/whitebeard
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/under/miscellaneous/whitebeard
+	name = "Whitebeard's attire"
+	item_path = /obj/item/clothing/under/costume/whitebeard
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/effects/spider
+	ckeywhitelist = list("Random516")
+	name = "Spider Transformation"
+	item_path = /obj/item/effect_granter/donator/spider
+	requires_purchase = FALSE
+
+//senri
+/datum/loadout_item/pocket_items/donator/slime
+	name = "Pet Delivery Beacon - Slime"
+	item_path = /obj/item/choice_beacon/pet/donator/slime
+	donator_only = TRUE
+	requires_purchase = FALSE
+	ckeywhitelist = list("Senri08")
+
+/datum/loadout_item/suit/beegirl
+	name = "Bee's Outfit"
+	item_path = /obj/item/clothing/suit/costume/beegirl
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/toys/puppycat
+	name = "Puppycat Plush"
+	item_path = /obj/item/toy/plush/puppycat
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/effects/slime
+	ckeywhitelist = list("Senri08")
+	name = "Slime Transformation"
+	item_path = /obj/item/effect_granter/donator/slime
+	requires_purchase = FALSE

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

@@ -32,14 +32,7 @@
 /obj/item/choice_beacon/pet/donator/void_mothroach
 	name = "Secret Beacon of the Stars"
 	default_name = "Moffles"
-	company_source = "*UNINTELLIGBLE BUZZING*"
-	company_message = "*LOUD MOFF NOISES*"
-	donator_pet = 	/mob/living/basic/mothroach/void
-
-/obj/item/choice_beacon/pet/donator/void_mothroach
-	name = "Secret Beacon of the Stars"
-	default_name = "Moffles"
-	company_source = "*UNINTELLIGBLE BUZZING*"
+	company_source = "*UNINTELLIGIBLE BUZZING*"
 	company_message = "*LOUD MOFF NOISES*"
 	donator_pet = 	/mob/living/basic/mothroach/void
 
@@ -48,11 +41,27 @@
 	default_name = "Blahaj"
 	company_source = "IKEA"
 	company_message = "Please enjoy your new pet -- some assembly required."
-	donator_pet = 	/mob/living/basic/lizard/blahaj
+	donator_pet = 	/mob/living/basic/pet/blahaj
 
 /obj/item/choice_beacon/pet/donator/cirno
 	name = "Cirno"
 	default_name = "Cirno?"
 	company_source = "Touhou"
 	company_message = "Please handle with care!"
-	donator_pet = 	/mob/living/basic/lizard/cirno
+	donator_pet = 	/mob/living/basic/pet/cirno
+
+/obj/item/choice_beacon/pet/donator/slime
+	name = "Slime"
+	default_name = "Slime"
+	company_source = "*blorbling*"
+	donator_pet = 	/mob/living/basic/pet/slime/talkative
+
+/obj/item/choice_beacon/pet/donator/spider
+	name = "Spider"
+	default_name = "Spider"
+	donator_pet = 	/mob/living/basic/pet/spider/dancing
+
+/obj/item/choice_beacon/pet/donator/germanshepherd
+	name = "German Shepherd"
+	default_name = "German Shepherd"
+	donator_pet = 	/mob/living/basic/pet/dog/germanshepherd

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

@@ -84,6 +84,7 @@
 	icon_state = "dark_hos"
 	inhand_icon_state = null
 	body_parts_covered = CHEST|ARMS
+
 /obj/item/clothing/head/costume/dark_hos
 	name = "\improper Dark Head of Security Cap"
 	desc = "Slip this on and you're gonna be cutting people with that edge."
@@ -100,3 +101,29 @@
 	icon_state = "lemon_bandolier"
 	body_parts_covered = CHEST
 	inhand_icon_state = null
+
+/obj/item/clothing/under/costume/whitebeard
+	name = "\improper Whitebeard's Attire"
+	desc = "The garb of a world renowned pirate."
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "wbunder"
+	worn_icon_state = "wbunder"
+	inhand_icon_state = null
+	body_parts_covered = LEGS
+
+/obj/item/clothing/neck/whitebeard
+	name = "Whitebeard's Jacket"
+	desc = "The jacket of a world renowned pirate."
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "wbcloak"
+	worn_icon_state = "wbcloak"
+
+/obj/item/clothing/suit/costume/beegirl
+	name = "Bee's Costume"
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "beegirl"
+	body_parts_covered = CHEST|ARMS
+	inhand_icon_state = null

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

@@ -0,0 +1,53 @@
+/obj/item/effect_granter/donator
+	name = "Donator Transformation"
+	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
+	icon_state = "void_mothroach"
+	var/mob/living/basic/animal_transformation = null
+
+/obj/item/effect_granter/donator/grant_effect(mob/living/carbon/granter)
+	var/mob/living/basic/animal = src.animal_transformation
+	animal = new animal(granter.loc)
+	animal.mind_initialize()
+	var/datum/mind/granters_mind = granter.mind
+	granters_mind.transfer_to(animal)
+	animal.adjust_hand_count(2)
+	qdel(granter)
+	. = ..()
+
+//Senri08
+/obj/item/effect_granter/donator/slime
+	name = "Slime transformation"
+	icon_state = "slime"
+	animal_transformation = /mob/living/basic/pet/slime/talkative
+
+//Random
+/obj/item/effect_granter/donator/spider
+	name = "Spider transformation"
+	icon_state = "spider"
+	animal_transformation = /mob/living/basic/pet/spider/dancing
+
+//mjolnir
+/obj/item/effect_granter/donator/germanshepherd
+	name = "German Shepherd transformation"
+	icon_state = "germanshepherd"
+	animal_transformation = /mob/living/basic/pet/dog/germanshepherd
+
+//bidlink2
+/obj/item/effect_granter/donator/cirno
+	name = "Cirno transformation"
+	icon = 'monkestation/icons/obj/plushes.dmi'
+	icon_state = "cirno-happy"
+	animal_transformation = /mob/living/basic/pet/cirno
+
+//Random
+/obj/item/effect_granter/donator/void_mothroach
+	name = "Mothroach transformation"
+	icon_state = "void_mothroach"
+	animal_transformation = /mob/living/basic/mothroach/void
+
+
+//Random
+/obj/item/effect_granter/donator/blahaj
+	name = "Blahaj transformation"
+	icon_state = "blahaj"
+	animal_transformation = /mob/living/basic/pet/blahaj

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

@@ -37,3 +37,15 @@
 	icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
 	squeak_override = list('goon/sounds/babynoise.ogg'=1)
 	icon_state = "spider"
+
+/obj/item/toy/plush/puppycat
+	name = "puppycat plush"
+	desc = "A plush of Puppycat. ~Handcrafted lovingly for Senri."
+	icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+	icon_state = "puppycat"
+
+/obj/item/toy/plush/hotdog
+	name = "hotdog plush"
+	desc = "A plush of a hotdog. ~Handcrafted lovingly for Spinnermaster."
+	icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
+	icon_state = "hotdog"