Merge pull request #521 from lmenvs/dono110423

Donator items - 11/4/23

monkestation/code/game/objects/items/choice_beacon.dm

@@ -29,7 +29,6 @@
 			/mob/living/basic/butterfly,
 			/mob/living/basic/bee/friendly,
 			/mob/living/basic/crab,
-			/mob/living/basic/crab/spycrab,
 			/mob/living/basic/pet/penguin/baby,
 			/mob/living/basic/pet/fox,
 			/mob/living/simple_animal/pet/cat,

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

@@ -26,11 +26,23 @@
 	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("TTNT789")
+
+/datum/loadout_item/effects/spycrab
+	ckeywhitelist = list("TTNT789")
+	name = "Spycrab Transformation"
+	item_path = /obj/item/effect_granter/donator/spycrab
+	requires_purchase = FALSE
+
 //spinnermaster
 
 /datum/loadout_item/pocket_items/donator/void_mothroach
@@ -201,3 +213,10 @@
 	name = "Slime Transformation"
 	item_path = /obj/item/effect_granter/donator/slime
 	requires_purchase = FALSE
+
+//odie
+/datum/loadout_item/head/space_marine
+	name = "Space Marine Helmet"
+	item_path = /obj/item/clothing/head/costume/space_marine
+	donator_only = TRUE
+	requires_purchase = FALSE

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

@@ -65,3 +65,4 @@
 	name = "German Shepherd"
 	default_name = "German Shepherd"
 	donator_pet = 	/mob/living/basic/pet/dog/germanshepherd
+

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

@@ -127,3 +127,17 @@
 	icon_state = "beegirl"
 	body_parts_covered = CHEST|ARMS
 	inhand_icon_state = null
+
+
+/obj/item/clothing/head/costume/space_marine
+	name = "Space Marine Helmet"
+	desc = "A replica helmet of a Space Marine.  Can be used as a gas mask, but cannot utilize filters."
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "space_marine"
+	inhand_icon_state = null
+	clothing_flags = BLOCK_GAS_SMOKE_EFFECT | HEADINTERNALS
+	flags_inv = HIDEEARS|HIDEEYES|HIDEFACE|HIDEFACIALHAIR|HIDESNOUT|HIDEHAIR
+	w_class = WEIGHT_CLASS_NORMAL
+	armor_type = /datum/armor/mask_gas
+	flags_cover = MASKCOVERSEYES | MASKCOVERSMOUTH | PEPPERPROOF

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

@@ -46,8 +46,14 @@
 	animal_transformation = /mob/living/basic/mothroach/void
 
 
-//Random
+//ruby
 /obj/item/effect_granter/donator/blahaj
 	name = "Blahaj transformation"
 	icon_state = "blahaj"
 	animal_transformation = /mob/living/basic/pet/blahaj
+
+//ttnt
+/obj/item/effect_granter/donator/spycrab
+	name = "Spycrab transformation"
+	icon_state = "crab_red"
+	animal_transformation = /mob/living/basic/crab/spycrab

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

@@ -24,6 +24,7 @@
 	. = ..()
 	var/random_icon = pick("crab_red","crab_blue")
 	icon_state = random_icon
+	icon_living = random_icon
 	icon_dead = "[random_icon]_dead"
 	gold_core_spawnable = NO_SPAWN
 
@@ -48,18 +49,23 @@
 	icon_gib = null
 	gold_core_spawnable = NO_SPAWN
 	ai_controller = /datum/ai_controller/basic_controller/
+	basic_mob_flags = FLIP_ON_DEATH
+
 /mob/living/basic/lizard/snake
 	name = "Three Headed Snake"
 	desc = "This little fella looks familiar..."
 	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
 	icon_state = "triple_snake"
+	icon_living = "triple_snake"
 	gold_core_spawnable = NO_SPAWN
 
 /mob/living/basic/pet/dog/germanshepherd
 	name = "German Shepherd"
 	desc = "He's so cool, he's got sunglasses!!"
 	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
 	icon_state = "germanshepherd"
+	icon_living = "germanshepherd"
+	icon_dead = "germanshepherd_dead"
 	icon_gib = null
 	can_be_held = FALSE // as funny as this would be, a german shepherd is way too big to carry with one hand
 	gold_core_spawnable = NO_SPAWN
@@ -69,6 +75,8 @@
 	desc = "He's got a lot to say!"
 	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
 	icon_state = "slime"
+	icon_living = "slime"
+	icon_dead = "slime_dead"
 	gold_core_spawnable = NO_SPAWN
 	initial_language_holder = /datum/language_holder/slime
 	ai_controller = /datum/ai_controller/basic_controller/
@@ -84,7 +92,7 @@
 
 /mob/living/basic/pet/slime/talkative/attack_hand(mob/living/carbon/human/user, list/modifiers)
 	. = ..()
-	if(src.stat != CONSCIOUS || (user.istate & ISTATE_HARM) || LAZYACCESS(modifiers, RIGHT_CLICK))
+	if(user == src || src.stat != CONSCIOUS || (user.istate & ISTATE_HARM) || LAZYACCESS(modifiers, RIGHT_CLICK))
 		return
 
 	new /obj/effect/temp_visual/heart(src.loc)
@@ -100,5 +108,7 @@
 	desc = "Look at him go!"
 	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
 	icon_state = "spider"
+	icon_living = "spider"
+	icon_dead = "spider_dead"
 	gold_core_spawnable = NO_SPAWN
 	ai_controller = /datum/ai_controller/basic_controller/