Skip to content

Commit 3ceb277

Browse files
[Donator] 475 519 562 (#6674)
1 parent 290210b commit 3ceb277

File tree

13 files changed

+165
-1
lines changed

13 files changed

+165
-1
lines changed

monkestation/code/modules/client/preferences/alt_jobs/titles.dm

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"Off-Duty Staff",
3131
"Off-Duty Crew",
3232
"Test Subject",
33+
"Vagabond",
3334
)
3435

3536
/datum/job/atmospheric_technician
@@ -109,6 +110,7 @@
109110
"Criminally Underpaid Babysitter",
110111
"Princess",
111112
"Head of Command",
113+
"Scapegoat",
112114
)
113115

114116
/datum/job/cargo_technician
@@ -119,6 +121,7 @@
119121
"Mailman",
120122
"Union Associate",
121123
"Inventory Associate",
124+
"Prime Delivery Associate",
122125
)
123126

124127
/datum/job/chaplain
@@ -134,6 +137,7 @@
134137
"Imam",
135138
"Rabbi",
136139
"Monk",
140+
"Mortician",
137141
)
138142

139143
/datum/job/chemist
@@ -220,6 +224,7 @@
220224
alt_titles = list(
221225
"Geneticist",
222226
"Mutation Researcher",
227+
"Genesmith",
223228
)
224229

225230
/datum/job/head_of_personnel
@@ -374,6 +379,7 @@
374379
"Mechanic",
375380
"Apprentice Engineer",
376381
"Engineering Trainee",
382+
"Station Reliability Engineer",
377383
)
378384

379385
/datum/job/virologist

monkestation/code/modules/donator/code/datum/loadout.dm

+64
Original file line numberDiff line numberDiff line change
@@ -816,3 +816,67 @@
816816
item_path = /obj/item/clothing/suit/hooded/wintercoat/strange_merchant
817817
donator_only = TRUE
818818
requires_purchase = FALSE
819+
820+
//Mycah
821+
/datum/loadout_item/plushies/kaiser_roach
822+
name = "Kaiser Roach"
823+
item_path = /obj/item/toy/plush/kaiser_roach
824+
donator_only = TRUE
825+
requires_purchase = FALSE
826+
827+
/datum/loadout_item/head/ironhammer_commander_hat
828+
name = "Ironhammer Commander Hat"
829+
item_path = /obj/item/clothing/head/costume/ironhammer_commander_hat
830+
donator_only = TRUE
831+
requires_purchase = FALSE
832+
833+
/datum/loadout_item/suit/ironhammer_commander_jacket
834+
name = "Ironhammer Commander Jacket"
835+
item_path = /obj/item/clothing/suit/ironhammer_commander_jacket
836+
donator_only = TRUE
837+
requires_purchase = FALSE
838+
839+
/datum/loadout_item/pocket_items/donator/eris_romch
840+
name = "Pet Delivery Beacon - Romch"
841+
item_path = /obj/item/choice_beacon/pet/donator/eris_romch
842+
donator_only = TRUE
843+
requires_purchase = FALSE
844+
ckeywhitelist = list("Mycah")
845+
846+
/datum/loadout_item/effects/eris_romch
847+
ckeywhitelist = list("Mycah")
848+
name = "Romch Transformation"
849+
item_path = /obj/item/effect_granter/donator/eris_romch
850+
requires_purchase = FALSE
851+
852+
//Mrsmall_theclown
853+
/datum/loadout_item/plushies/clown_king
854+
name = "Clown King"
855+
item_path = /obj/item/toy/plush/clown_king
856+
donator_only = TRUE
857+
requires_purchase = FALSE
858+
859+
/datum/loadout_item/head/ironhammer_commander_hat
860+
name = "Grand Clown King Crown"
861+
item_path = /obj/item/clothing/head/costume/clown_king_crown
862+
donator_only = TRUE
863+
requires_purchase = FALSE
864+
865+
/datum/loadout_item/neck/clown_king_cloak
866+
name = "Grand Clown King Cloak"
867+
item_path = /obj/item/clothing/neck/clown_king_cloak
868+
donator_only = TRUE
869+
requires_purchase = FALSE
870+
871+
/datum/loadout_item/pocket_items/donator/theclown_clownpet
872+
name = "Pet Delivery Beacon - Short Clown"
873+
item_path = /obj/item/choice_beacon/pet/donator/theclown_clownpet
874+
donator_only = TRUE
875+
requires_purchase = FALSE
876+
ckeywhitelist = list("Mycah")
877+
878+
/datum/loadout_item/effects/eris_romch
879+
ckeywhitelist = list("Mycah")
880+
name = "Short Clown Transformation"
881+
item_path = /obj/item/effect_granter/donator/theclown_clownpet
882+
requires_purchase = FALSE

monkestation/code/modules/donator/code/item/choice_beacon.dm

+10
Original file line numberDiff line numberDiff line change
@@ -130,3 +130,13 @@
130130
name = "tall baby pukeko"
131131
default_name = "tall baby pukeko"
132132
donator_pet = /mob/living/basic/pet/babypukeko/tall
133+
134+
/obj/item/choice_beacon/pet/donator/eris_romch
135+
name = "romch"
136+
default_name = "romch"
137+
donator_pet = /mob/living/basic/pet/eris_romch
138+
139+
/obj/item/choice_beacon/pet/donator/theclown_clownpet
140+
name = "short clown"
141+
default_name = "short clown"
142+
donator_pet = /mob/living/basic/pet/theclown_clownpet

monkestation/code/modules/donator/code/item/clothing.dm

+32
Original file line numberDiff line numberDiff line change
@@ -699,3 +699,35 @@
699699
icon_state = "strange_merchant_hood"
700700
worn_icon_state = "strange_merchant_hood"
701701
flags_inv = HIDEHAIR|HIDEFACIALHAIR|HIDEEARS
702+
703+
/obj/item/clothing/head/costume/ironhammer_commander_hat
704+
name = "ironhammer commander hat"
705+
desc = "It's a cowboy hat that has the logo \"IH\" on the gold band. It smells like oranges and blood."
706+
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
707+
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
708+
icon_state = "ironhammer_commander_hat"
709+
inhand_icon_state = null
710+
711+
/obj/item/clothing/suit/ironhammer_commander_jacket
712+
name = "ironhammer commander jacket"
713+
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."
714+
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
715+
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
716+
icon_state = "ironhammer_commander_jacket"
717+
worn_icon_state = "ironhammer_commander_jacket"
718+
719+
/obj/item/clothing/head/costume/clown_king_crown
720+
name = "grand clown king crown"
721+
desc = "It's the Grand Clown King CROWN!! It smells like rubber."
722+
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
723+
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing_32x48.dmi'
724+
icon_state = "clown_king_crown"
725+
inhand_icon_state = null
726+
727+
/obj/item/clothing/neck/clown_king_cloak
728+
name = "grand clown king cloak"
729+
desc = "It's the CLOAK of the Grand Clown King! It smells like nylon."
730+
icon = 'monkestation/code/modules/donator/icons/obj/clothing.dmi'
731+
worn_icon = 'monkestation/code/modules/donator/icons/mob/clothing.dmi'
732+
icon_state = "clown_king_cloak"
733+
worn_icon_state = "clown_king_cloak"

monkestation/code/modules/donator/code/item/effects.dm

+14
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,17 @@
146146
icon = 'monkestation/code/modules/donator/icons/mob/pets_160x160.dmi'
147147
icon_state = "tallbabypukeko"
148148
animal_transformation = /mob/living/basic/pet/babypukeko/tall
149+
150+
//Mycah
151+
/obj/item/effect_granter/donator/eris_romch
152+
name = "romch"
153+
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
154+
icon_state = "romch"
155+
animal_transformation = /mob/living/basic/pet/eris_romch
156+
157+
//Mrsmall_theclown
158+
/obj/item/effect_granter/donator/theclown_clownpet
159+
name = "short clown"
160+
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
161+
icon_state = "theclown_clownpet"
162+
animal_transformation = /mob/living/basic/pet/theclown_clownpet

monkestation/code/modules/donator/code/item/plush.dm

+12
Original file line numberDiff line numberDiff line change
@@ -168,3 +168,15 @@
168168
desc = "A plushie of Jill! It's handmade too!"
169169
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
170170
icon_state = "jill_plushie"
171+
172+
/obj/item/toy/plush/kaiser_roach
173+
name = "kaiser roach plush"
174+
desc = "A plushie of a kaiser roach."
175+
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
176+
icon_state = "kaiser_roach"
177+
178+
/obj/item/toy/plush/clown_king
179+
name = "clown king plush"
180+
desc = "A plushie of a clown king!"
181+
icon = 'monkestation/code/modules/donator/icons/obj/plushes.dmi'
182+
icon_state = "clown_king"

monkestation/code/modules/donator/code/mob/pets.dm

+25
Original file line numberDiff line numberDiff line change
@@ -321,3 +321,28 @@
321321
icon_living = "tallbabypukeko"
322322
icon_dead = "tallbabypukeko-dead"
323323
pixel_x = -96
324+
325+
/mob/living/basic/pet/eris_romch
326+
name = "romch"
327+
desc = "romch ."
328+
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
329+
icon_state = "romch"
330+
icon_living = "romch"
331+
icon_dead = "romch-dead"
332+
icon_gib = null
333+
gold_core_spawnable = NO_SPAWN
334+
ai_controller = /datum/ai_controller/basic_controller/
335+
ckeywhitelist = list("Mycah")
336+
337+
/mob/living/basic/pet/theclown_clownpet
338+
name = "short clown"
339+
desc = "He's just a funny little guy."
340+
icon = 'monkestation/code/modules/donator/icons/mob/pets.dmi'
341+
icon_state = "theclown_clownpet"
342+
icon_living = "theclown_clownpet"
343+
icon_dead = "theclown_clownpet-dead"
344+
icon_gib = null
345+
gold_core_spawnable = NO_SPAWN
346+
ai_controller = /datum/ai_controller/basic_controller/
347+
ckeywhitelist = list("Mrsmall_theclown")
348+
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

strings/pill_names.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -251,5 +251,6 @@
251251
"COFFEE CREAM EXTREME",
252252
"Spice Melange",
253253
"Porg Pill",
254-
"Eezo"
254+
"Eezo",
255+
"Cynothoglys Embrace"
255256
]

0 commit comments

Comments
 (0)