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

[MIRROR] Adds a donor item for DprMstr #5139

Closed
wants to merge 2 commits into from
Closed
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
Binary file not shown.
Binary file modified modular_nova/master_files/icons/donator/obj/clothing/suits.dmi
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,30 @@
button_icon = 'modular_nova/master_files/icons/donator/obj/custom.dmi'
button_icon_state = "drawingtablet"

<<<<<<< HEAD

Check failure on line 196 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '<<', expected one of: ';', '//!', '/*!', '/'

Check warning on line 196 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:197:6
=======

Check warning on line 197 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:199:6
// Donation reward for DrpMstr
/obj/item/clothing/suit/costume/butter
name = "butter costume"
desc = "Made from only the highest quality cardboard. Caution, contents include Slime and Butter, do not ingest."
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.dmi'
icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi'
lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi'
righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi'
icon_state = "butterbox"
inhand_icon_state = "butterbox"

//Donation reward for Thedragmeme
/obj/item/bouquet/stellar
name = "stellar bouquet"
desc = "An elaborate mix of flowers that shimmer delicately in the light. Topped with a silver moon."
icon_state = "starbouquet"
inhand_icon_state = "starbouquet"
icon = 'modular_nova/master_files/icons/donator/obj/custom.dmi'
lefthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_left.dmi'
righthand_file = 'modular_nova/master_files/icons/donator/mob/inhands/donator_right.dmi'

>>>>>>> 2b2d7bafe1b (Adds a donor item for DprMstr (#4520))

Check failure on line 219 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0001: Invalid number

Check warning on line 219 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:221:6
// Donation reward for Thedragmeme
/obj/item/clothing/neck/padded
name = "feathered serenity cloak"
Expand All @@ -219,6 +243,21 @@
var/mob/wearer = loc
wearer.update_body()

<<<<<<< HEAD

Check warning on line 246 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:247:6
=======

Check warning on line 247 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:249:6
//Donation reward for Thedragmeme, gift for ActualVanguard
/obj/item/clothing/neck/padded/security
name = "vanguard cloak"
desc = "A meticulously handcrafted cloak that is lined with subtle pockets filled with feathers and down. Oddly enough, you always feel comfortable regardless of the weather. Even odder, there is an ever so faint scent of wet rock on the interior of the cloak."
icon_state = "paddedsec"
inhand_icon_state = "paddedsec"
hood_type = /obj/item/clothing/head/hooded/padded/security

/obj/item/clothing/head/hooded/padded/security
name = "vanguard cloak hood"
icon_state = "paddedsechood"

>>>>>>> 2b2d7bafe1b (Adds a donor item for DprMstr (#4520))

Check failure on line 260 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0001: Invalid number

Check warning on line 260 in modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/customization/modules/clothing/~donator/donator_clothing.dm:261:6
/obj/item/clothing/head/hooded/padded
name = "feathered serenity hood"
icon_state = "paddedhood"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -790,6 +790,11 @@
name = "Colourable Heart Sweater"
item_path = /obj/item/clothing/suit/heart_sweater

/datum/loadout_item/suit/butter
name = "Butter Costume"
item_path = /obj/item/clothing/suit/costume/butter
ckeywhitelist = list("drpmstr, pyritechimera")

// Fancy crop-top jackets

/datum/loadout_item/suit/crop_jacket
Expand Down
Loading