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 all commits
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
6 changes: 4 additions & 2 deletions code/modules/mob/living/basic/vermin/butterfly.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
34 changes: 33 additions & 1 deletion monkestation/code/modules/donator/code/datum/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
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/spacial
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
7 changes: 7 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,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
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"
14 changes: 14 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,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
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.
2 changes: 1 addition & 1 deletion strings/pill_names.json
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@
"Ian",
"Ice",
"Jumper",
"Kat",
"Kilgor",
"Lettuce",
"Lightning",
Expand Down Expand Up @@ -210,6 +209,7 @@
"Turbo",
"Tweak",
"Uppers",
"Velvet",
"Vitamin",
"Voodoo",
"Vorpal",
Expand Down
Loading