Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Donator items 012224 #1025

Merged
merged 6 commits into from
Jan 27, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 39 additions & 7 deletions monkestation/code/modules/donator/code/datum/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -234,11 +234,7 @@
requires_purchase = FALSE

//rickdude
/datum/loadout_item/suit/aotcloak
name = "Survey Corps Cloak"
item_path = /obj/item/clothing/suit/hooded/aotcloak
donator_only = TRUE
requires_purchase = FALSE


//kon chieko
/datum/loadout_item/head/bells
Expand All @@ -248,9 +244,45 @@
requires_purchase = FALSE

//zedmastermind
/datum/loadout_item/head/zed_officercap
/datum/loadout_item/head/zed_offic/datum/loadout_item/suit/aotcloak
name = "Survey Corps Cloak"
item_path = /obj/item/clothing/suit/hooded/aotcloak
donator_only = TRUE
requires_purchase = FALSE
name = "Zed Officer Cap"
item_path = /obj/item/clothing/head/costume/zed_officercap
donator_only = TRUE
requires_purchase = FALSE
ckeywhitelist = list("zedmastermind")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I... don't think you meant to move the aotcloak to another part of the file - and I especially don't think you meant to remove the ckeywhitelist for the zed_officercap.


//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
4 changes: 4 additions & 0 deletions monkestation/code/modules/donator/code/item/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
18 changes: 18 additions & 0 deletions monkestation/code/modules/donator/code/item/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions monkestation/code/modules/donator/code/item/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -57,3 +57,8 @@
name = "Spycrab transformation"
icon_state = "crab_red"
animal_transformation = /mob/living/basic/crab/spycrab

/obj/item/effect_granter/donator/void_butterfly
name = "void butterfly transformation"
icon_state = "void_butterfly"
animal_transformation = /mob/living/basic/butterfly/void
6 changes: 6 additions & 0 deletions monkestation/code/modules/donator/code/item/plush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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"
10 changes: 10 additions & 0 deletions monkestation/code/modules/donator/code/mob/pets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,3 +112,13 @@
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
ai_controller = /datum/ai_controller/basic_controller/
Binary file modified monkestation/code/modules/donator/icons/mob/clothing.dmi
Binary file not shown.
Binary file modified monkestation/code/modules/donator/icons/mob/pets.dmi
Binary file not shown.
Binary file modified monkestation/code/modules/donator/icons/obj/clothing.dmi
Binary file not shown.
Binary file modified monkestation/code/modules/donator/icons/obj/plushes.dmi
Binary file not shown.
Loading