Skip to content

[Donator] 475 519 562 #6674

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

Merged
merged 1 commit into from
May 13, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"Off-Duty Staff",
"Off-Duty Crew",
"Test Subject",
"Vagabond",
)

/datum/job/atmospheric_technician
Expand Down Expand Up @@ -109,6 +110,7 @@
"Criminally Underpaid Babysitter",
"Princess",
"Head of Command",
"Scapegoat",
)

/datum/job/cargo_technician
Expand All @@ -119,6 +121,7 @@
"Mailman",
"Union Associate",
"Inventory Associate",
"Prime Delivery Associate",
)

/datum/job/chaplain
Expand All @@ -134,6 +137,7 @@
"Imam",
"Rabbi",
"Monk",
"Mortician",
)

/datum/job/chemist
Expand Down Expand Up @@ -220,6 +224,7 @@
alt_titles = list(
"Geneticist",
"Mutation Researcher",
"Genesmith",
)

/datum/job/head_of_personnel
Expand Down Expand Up @@ -374,6 +379,7 @@
"Mechanic",
"Apprentice Engineer",
"Engineering Trainee",
"Station Reliability Engineer",
)

/datum/job/virologist
Expand Down
64 changes: 64 additions & 0 deletions monkestation/code/modules/donator/code/datum/loadout.dm
Original file line number Diff line number Diff line change
Expand Up @@ -816,3 +816,67 @@
item_path = /obj/item/clothing/suit/hooded/wintercoat/strange_merchant
donator_only = TRUE
requires_purchase = FALSE

//Mycah
/datum/loadout_item/plushies/kaiser_roach
name = "Kaiser Roach"
item_path = /obj/item/toy/plush/kaiser_roach
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/head/ironhammer_commander_hat
name = "Ironhammer Commander Hat"
item_path = /obj/item/clothing/head/costume/ironhammer_commander_hat
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/suit/ironhammer_commander_jacket
name = "Ironhammer Commander Jacket"
item_path = /obj/item/clothing/suit/ironhammer_commander_jacket
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/pocket_items/donator/eris_romch
name = "Pet Delivery Beacon - Romch"
item_path = /obj/item/choice_beacon/pet/donator/eris_romch
donator_only = TRUE
requires_purchase = FALSE
ckeywhitelist = list("Mycah")

/datum/loadout_item/effects/eris_romch
ckeywhitelist = list("Mycah")
name = "Romch Transformation"
item_path = /obj/item/effect_granter/donator/eris_romch
requires_purchase = FALSE

//Mrsmall_theclown
/datum/loadout_item/plushies/clown_king
name = "Clown King"
item_path = /obj/item/toy/plush/clown_king
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/head/ironhammer_commander_hat
name = "Grand Clown King Crown"
item_path = /obj/item/clothing/head/costume/clown_king_crown
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/neck/clown_king_cloak
name = "Grand Clown King Cloak"
item_path = /obj/item/clothing/neck/clown_king_cloak
donator_only = TRUE
requires_purchase = FALSE

/datum/loadout_item/pocket_items/donator/theclown_clownpet
name = "Pet Delivery Beacon - Short Clown"
item_path = /obj/item/choice_beacon/pet/donator/theclown_clownpet
donator_only = TRUE
requires_purchase = FALSE
ckeywhitelist = list("Mycah")

/datum/loadout_item/effects/eris_romch
ckeywhitelist = list("Mycah")
name = "Short Clown Transformation"
item_path = /obj/item/effect_granter/donator/theclown_clownpet
requires_purchase = FALSE
10 changes: 10 additions & 0 deletions monkestation/code/modules/donator/code/item/choice_beacon.dm
Original file line number Diff line number Diff line change
Expand Up @@ -130,3 +130,13 @@
name = "tall baby pukeko"
default_name = "tall baby pukeko"
donator_pet = /mob/living/basic/pet/babypukeko/tall

/obj/item/choice_beacon/pet/donator/eris_romch
name = "romch"
default_name = "romch"
donator_pet = /mob/living/basic/pet/eris_romch

/obj/item/choice_beacon/pet/donator/theclown_clownpet
name = "short clown"
default_name = "short clown"
donator_pet = /mob/living/basic/pet/theclown_clownpet
32 changes: 32 additions & 0 deletions monkestation/code/modules/donator/code/item/clothing.dm
Original file line number Diff line number Diff line change
Expand Up @@ -699,3 +699,35 @@
icon_state = "strange_merchant_hood"
worn_icon_state = "strange_merchant_hood"
flags_inv = HIDEHAIR|HIDEFACIALHAIR|HIDEEARS

/obj/item/clothing/head/costume/ironhammer_commander_hat
name = "ironhammer commander hat"
desc = "It's a cowboy hat that has the logo \"IH\" on the gold band. It smells like oranges and blood."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "ironhammer_commander_hat"
inhand_icon_state = null

/obj/item/clothing/suit/ironhammer_commander_jacket
name = "ironhammer commander jacket"
desc = "A strange commander jacket made of A plastic and nylon to seem as if it were armored. It has a logo \"IH\" on a sleeve."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "ironhammer_commander_jacket"
worn_icon_state = "ironhammer_commander_jacket"

/obj/item/clothing/head/costume/clown_king_crown
name = "grand clown king crown"
desc = "It's the Grand Clown King CROWN!! It smells like rubber."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi'
icon_state = "clown_king_crown"
inhand_icon_state = null

/obj/item/clothing/neck/clown_king_cloak
name = "grand clown king cloak"
desc = "It's the CLOAK of the Grand Clown King! It smells like nylon."
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
icon_state = "clown_king_cloak"
worn_icon_state = "clown_king_cloak"
14 changes: 14 additions & 0 deletions monkestation/code/modules/donator/code/item/effects.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,3 +146,17 @@
icon = 'monkestation/code/modules/donator/icons/mob/pets_160x160.dmi'
icon_state = "tallbabypukeko"
animal_transformation = /mob/living/basic/pet/babypukeko/tall

//Mycah
/obj/item/effect_granter/donator/eris_romch
name = "romch"
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
icon_state = "romch"
animal_transformation = /mob/living/basic/pet/eris_romch

//Mrsmall_theclown
/obj/item/effect_granter/donator/theclown_clownpet
name = "short clown"
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
icon_state = "theclown_clownpet"
animal_transformation = /mob/living/basic/pet/theclown_clownpet
12 changes: 12 additions & 0 deletions monkestation/code/modules/donator/code/item/plush.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,3 +168,15 @@
desc = "A plushie of Jill! It's handmade too!"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "jill_plushie"

/obj/item/toy/plush/kaiser_roach
name = "kaiser roach plush"
desc = "A plushie of a kaiser roach."
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "kaiser_roach"

/obj/item/toy/plush/clown_king
name = "clown king plush"
desc = "A plushie of a clown king!"
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
icon_state = "clown_king"
25 changes: 25 additions & 0 deletions monkestation/code/modules/donator/code/mob/pets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -321,3 +321,28 @@
icon_living = "tallbabypukeko"
icon_dead = "tallbabypukeko-dead"
pixel_x = -96

/mob/living/basic/pet/eris_romch
name = "romch"
desc = "romch ."
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
icon_state = "romch"
icon_living = "romch"
icon_dead = "romch-dead"
icon_gib = null
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/
ckeywhitelist = list("Mycah")

/mob/living/basic/pet/theclown_clownpet
name = "short clown"
desc = "He's just a funny little guy."
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
icon_state = "theclown_clownpet"
icon_living = "theclown_clownpet"
icon_dead = "theclown_clownpet-dead"
icon_gib = null
gold_core_spawnable = NO_SPAWN
ai_controller = /datum/ai_controller/basic_controller/
ckeywhitelist = list("Mrsmall_theclown")

Binary file modified monkestation/code/modules/donator/icons/mob/clothing.dmi
Binary file not shown.
Binary file modified monkestation/code/modules/donator/icons/mob/clothing_32x48.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.
3 changes: 2 additions & 1 deletion strings/pill_names.json
Original file line number Diff line number Diff line change
Expand Up @@ -251,5 +251,6 @@
"COFFEE CREAM EXTREME",
"Spice Melange",
"Porg Pill",
"Eezo"
"Eezo",
"Cynothoglys Embrace"
]
Loading