Skip to content

Commit

Permalink
the whole thing with bugs probably
Browse files Browse the repository at this point in the history
  • Loading branch information
polygoblyn committed Jun 3, 2024
1 parent be3faff commit b8f73dd
Show file tree
Hide file tree
Showing 17 changed files with 159 additions and 1 deletion.
54 changes: 54 additions & 0 deletions monkestation/code/modules/donator/code/datum/loadout.dm
Original file line number Diff line number Diff line change
@@ -1,3 +1,23 @@
//assorted plushes
/datum/loadout_item/toys/pim
name = "Pim Plush"
item_path = /obj/item/toy/plush/pim
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/toys/glep
name = "Glep Plush"
item_path = /obj/item/toy/plush/glep
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/toys/mr_frog
name = "Mr. Frog Plush"
item_path = /obj/item/toy/plush/mr_frog
donator_only = TRUE
requires_purchase = FALSE


//bidlink

/datum/loadout_item/suit/cirno_outfit
Expand Down Expand Up @@ -394,6 +414,7 @@
item_path = /obj/item/clothing/neck/bell
donator_only = TRUE
requires_purchase = FALSE

//OLIVER ITEMS
/datum/loadout_item/suit/jacket_oliver
name = "Scarved Jacket"
Expand All @@ -408,3 +429,36 @@
donator_only = TRUE
requires_purchase = FALSE
restricted_roles = list(JOB_SECURITY_OFFICER,JOB_SECURITY_ASSISTANT,JOB_HEAD_OF_SECURITY,JOB_WARDEN)


//elliethedarksun
/datum/loadout_item/pocket_items/donator/gumball_goblin
name = "Pet Delivery Beacon - Gumball Goblin"
item_path = /obj/item/choice_beacon/pet/donator/gumball_goblin
donator_only = TRUE
requires_purchase = FALSE
ckeywhitelist = list("elliethedarksun")

/datum/loadout_item/suit/gumball_wizard_robe
name = "Gumball Wizard Robe"
item_path = /obj/item/clothing/suit/costume/gumball_wizard_robe
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/head/gumball_wizard_hat
name = "Gumball Wizard Hat"
item_path = /obj/item/clothing/head/costume/gumball_wizard_hat
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/effects/gumball_goblin
ckeywhitelist = list("elliethedarksun")
name = "Quil Maid Transformation"
item_path = /obj/item/effect_granter/donator/gumball_goblin
requires_purchase = FALSE

/datum/loadout_item/toys/gumball_goblin
name = "Gumball Goblin Plush"
item_path = /obj/item/toy/plush/gumball_goblin
donator_only = TRUE
requires_purchase = FALSE
5 changes: 5 additions & 0 deletions monkestation/code/modules/donator/code/item/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,3 +80,8 @@
name = "Quil Maid"
default_name = "Quil Maid"
donator_pet = /mob/living/basic/pet/quilmaid

/obj/item/choice_beacon/pet/donator/gumball_goblin
name = "Gumball Goblin"
default_name = "Gumball Goblin"
donator_pet = /mob/living/basic/pet/gumball_goblin
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 @@ -389,3 +389,21 @@
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "sechud_terminated"


/obj/item/clothing/suit/costume/gumball_wizard_robe
name = "\improper Gumball Wizard Robe"
desc = "A robe adorned with brightly colored gumballs."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "gumball_wizard_robe"
inhand_icon_state = null
body_parts_covered = CHEST|ARMS|LEGS

/obj/item/clothing/head/costume/gumball_wizard_hat
name = "\improper Gumball Wizard Robe"
desc = "A hat adorned with a brightly colored jewel."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "gumball_wizard_hat"
inhand_icon_state = null
6 changes: 5 additions & 1 deletion monkestation/code/modules/donator/code/item/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -78,4 +78,8 @@
icon_state = "quil_maid"
animal_transformation = /mob/living/basic/pet/quilmaid


//ellie
/obj/item/effect_granter/donator/gumball_goblin
name = "gumball goblin transformation"
icon_state = "gumball_goblin"
animal_transformation = /mob/living/basic/pet/gumball_goblin
32 changes: 32 additions & 0 deletions monkestation/code/modules/donator/code/item/plush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,35 @@
desc = "A plush of the Lizard Basil. ~Handcrafted lovingly for quilark"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "quilark"

/obj/item/toy/plush/gumball_goblin
name = "gumball goblin plush"
desc = "A plush of a Gumball Goblin. He was abducted while pondering his gumballs. Help. ~Handcrafted lovingly for elliethedarksun"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "gumball_goblin"


/obj/item/toy/plush/glep
name = "glep plush"
desc = "A plush of Glep."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "glep"
squeak_override = list('monkestation/code/modules/donator/sounds/glep1.ogg'=1,
'monkestation/code/modules/donator/sounds/glep2.ogg'=1,
'monkestation/code/modules/donator/sounds/glep3.ogg'=1)

/obj/item/toy/plush/mr_frog
name = "mr frog plush"
desc = "A plush of a classic beloved television star, Mr. Frog."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "mr_frog"
squeak_override = list('monkestation/code/modules/donator/sounds/mr_frog1.ogg'=1,
'monkestation/code/modules/donator/sounds/mr_frog2.ogg'=1,
'monkestation/code/modules/donator/sounds/mr_frog3.ogg'=1)

/obj/item/toy/plush/pim
name = "pim plush"
desc = "A plush of Pim."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "pim"
squeak_override = list('monkestation/code/modules/donator/sounds/pim.ogg'=1)
45 changes: 45 additions & 0 deletions monkestation/code/modules/donator/code/mob/pets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -147,3 +147,48 @@
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/

/mob/living/basic/pet/gumball_goblin
name = "Gumball Goblin"
desc = "AAAAAAAAAAAAAAAA"
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
icon_state = "gumball_goblin"
icon_living = "gumball_goblin"
icon_dead = "gumball_goblin_dead"
gold_core_spawnable = NO_SPAWN

///Ability
var/datum/action/cooldown/lay_gumball/gumball_ability


/mob/living/basic/pet/gumball_goblin/Initialize(mapload)
. = ..()
gumball_ability = new()
gumball_ability.Grant(src)


///drops peels around the mob when activated
/datum/action/cooldown/lay_gumball
name = "Lay gumball"
desc = "Produce a gumball"
cooldown_time = 15 SECONDS
button_icon_state = "gumball"
button_icon = 'icons/obj/food/lollipop.dmi'
background_icon_state = "bg_nature"
overlay_icon_state = "bg_nature_border"
///which type of gumballs to spawn
var/gumball_type = /obj/item/food/gumball
///How many gumballs to spawn
var/gumball_amount = 1

/datum/action/cooldown/lay_gumball/Activate(atom/target)
. = ..()
var/list/reachable_turfs = list()
for(var/turf/adjacent_turf in RANGE_TURFS(1, owner.loc))
if(adjacent_turf == owner.loc || !owner.CanReach(adjacent_turf) || !isopenturf(adjacent_turf))
continue
reachable_turfs += adjacent_turf

var/gumballs_to_spawn = min(gumball_amount, reachable_turfs.len)
for(var/i in 1 to gumballs_to_spawn)
new gumball_type(pick_n_take(reachable_turfs))
StartCooldown()
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added monkestation/code/modules/donator/sounds/pim.ogg
Binary file not shown.

0 comments on commit b8f73dd

Please sign in to comment.