[Donator] Demon and Centcom Jacket (#3503)

* demons! and a centcom jacket * Update clothing.dm --------- Co-authored-by: ThePooba <[email protected]>
Monkestation · Sep 22, 2024 · 1bfa735 · 1bfa735
1 parent 44371f1
commit 1bfa735
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 3 deletions.
diff --git a/monkestation/code/modules/donator/code/datum/loadout.dm b/monkestation/code/modules/donator/code/datum/loadout.dm
@@ -488,6 +488,25 @@
 	donator_only = TRUE
 	requires_purchase = FALSE
 
+/datum/loadout_item/suit/centcom_jacket
+	name = "Centcom Jacket"
+	item_path = /obj/item/clothing/suit/toggle/centcom_jacket
+	donator_only = TRUE
+	requires_purchase = FALSE
+
+/datum/loadout_item/pocket_items/donator/ghastly_evil_demon
+	name = "Pet Delivery Beacon - Ghastly Evil Demon"
+	item_path = /obj/item/choice_beacon/pet/donator/ghastly_evil_demon
+	donator_only = TRUE
+	requires_purchase = FALSE
+	ckeywhitelist = list("ThePooba")
+
+/datum/loadout_item/effects/ghastly_evil_demon
+	ckeywhitelist = list("ThePooba")
+	name = "Ghastly Evil Demon Transformation"
+	item_path = /obj/item/effect_granter/donator/ghastly_evil_demon
+	requires_purchase = FALSE
+
 //Mr_Sandman02
 /datum/loadout_item/suit/menacing_jacket
 	name = "Menacing Jacket"

diff --git a/monkestation/code/modules/donator/code/item/choice_beacon.dm b/monkestation/code/modules/donator/code/item/choice_beacon.dm
@@ -98,10 +98,15 @@
 
 /obj/item/choice_beacon/pet/donator/darkscug
 	name = "night slugcat"
-	default_name ="night slugcat"
+	default_name = "night slugcat"
 	donator_pet = 	/mob/living/basic/pet/darkscug
 
 /obj/item/choice_beacon/pet/donator/hypnotoad
 	name = "hypnotoad"
-	default_name ="hypnotoad"
+	default_name = "hypnotoad"
 	donator_pet = 	/mob/living/basic/frog/hypnotoad
+
+/obj/item/choice_beacon/pet/donator/ghastly_evil_demon
+	name = "ghastly evil demon"
+	default_name = "ghastly evil demon"
+	donator_pet = 	/mob/living/basic/pet/ghastly_evil_demon
diff --git a/monkestation/code/modules/donator/code/item/clothing.dm b/monkestation/code/modules/donator/code/item/clothing.dm
@@ -526,3 +526,13 @@
 	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
 	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
 	icon_state = "mothysmantle_hood"
+
+/obj/item/clothing/suit/toggle/centcom_jacket
+	icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
+	worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
+	icon_state = "centcom_jacket"
+	name = "centcom jacket"
+	desc = "A varsity jacket in design of centcom! It seems well made."
+	body_parts_covered = CHEST|GROIN|ARMS
+	//cold_protection = CHEST|GROIN|ARMS
+	min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/monkestation/code/modules/donator/code/item/effects.dm b/monkestation/code/modules/donator/code/item/effects.dm
@@ -3,6 +3,7 @@
 	icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
 	icon_state = "void_mothroach"
 	var/mob/living/basic/animal_transformation = null
+	var/basic_inhands_y_offset = -6
 
 /obj/item/effect_granter/donator/grant_effect(mob/living/carbon/granter)
 	var/mob/living/basic/animal = src.animal_transformation
@@ -11,7 +12,7 @@
 	var/datum/mind/granters_mind = granter.mind
 	granters_mind.transfer_to(animal)
 	animal.AddElement(/datum/element/dextrous)
-	animal.AddComponent(/datum/component/basic_inhands, y_offset = -6)
+	animal.AddComponent(/datum/component/basic_inhands, y_offset = basic_inhands_y_offset)
 	qdel(granter)
 	. = ..()
 
@@ -110,3 +111,11 @@
 	name = "hypnotoad transformation"
 	icon_state = "hypnotoad"
 	animal_transformation = /mob/living/basic/frog/hypnotoad
+
+//ThePooba
+/obj/item/effect_granter/donator/ghastly_evil_demon
+	name = "ghastly evil demon transformation"
+	icon = 'monkestation/code/modules/donator/icons/mob/pets_32x48.dmi'
+	icon_state = "ghastly_evil_demon"
+	animal_transformation = /mob/living/basic/pet/ghastly_evil_demon
+	basic_inhands_y_offset = 0
diff --git a/monkestation/code/modules/donator/code/mob/pets.dm b/monkestation/code/modules/donator/code/mob/pets.dm
@@ -266,3 +266,16 @@
 	gold_core_spawnable = NO_SPAWN
 	ai_controller = /datum/ai_controller/basic_controller/
 	ckeywhitelist = list("Ophaq")
+
+/mob/living/basic/pet/ghastly_evil_demon
+	name = "ghastly evil demon"
+	desc = "It's so scary!"
+	icon = 'monkestation/code/modules/donator/icons/mob/pets_32x48.dmi'
+	icon_state = "ghastly_evil_demon"
+	icon_living = "ghastly_evil_demon"
+	icon_dead = "ghastly_evil_demon-dead"
+	icon_gib = null
+	gold_core_spawnable = NO_SPAWN
+	ai_controller = /datum/ai_controller/basic_controller/
+	ckeywhitelist = list("ThePooba")
+	movement_type = FLYING
diff --git a/monkestation/code/modules/donator/icons/mob/clothing.dmi b/monkestation/code/modules/donator/icons/mob/clothing.dmi
diff --git a/monkestation/code/modules/donator/icons/mob/pets_32x48.dmi b/monkestation/code/modules/donator/icons/mob/pets_32x48.dmi
diff --git a/monkestation/code/modules/donator/icons/obj/clothing.dmi b/monkestation/code/modules/donator/icons/obj/clothing.dmi