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 donor items for thedragmeme #5171

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
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,43 @@
var/mob/wearer = loc
wearer.update_body()

<<<<<<< HEAD

Check failure on line 222 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 222 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:223:6
=======

Check warning on line 223 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:226:6
//Donation reward for Thedragmeme
//Have I reached suspiciously wealthy furry status yet? /j
/obj/item/clothing/under/sweater_dress
name = "virgin killer sweater"
desc = "A meticulously knitted sweater that shows off ALL the right places. This is BARELY considered work attire."
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 = "virginslayer"
inhand_icon_state = "virginslayer"

/obj/item/clothing/suit/jacket/bomber_donor
name = "old hoodie"
desc = "A somewhat well worn jacket, appears to be way too big considering who owns it."
icon = 'modular_nova/master_files/icons/donator/obj/clothing/suits.dmi'
worn_icon = 'modular_nova/master_files/icons/donator/mob/clothing/suit.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 = "bomber"
inhand_icon_state = "bomber"

//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"

>>>>>>> 72a226822c2 (Adds donor items for thedragmeme (#4574))

Check failure on line 258 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 258 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:259: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 @@ -3,6 +3,152 @@
item_path = /obj/item/canvas/drawingtablet
donator_only = TRUE

<<<<<<< HEAD

Check warning on line 6 in modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm:7:6
=======

Check warning on line 7 in modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm:8:8
/datum/loadout_item/pocket_items/stellar_bouquet
name = "Stellar Bouquet"
item_path = /obj/item/bouquet/stellar

Check failure on line 10 in modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0404: Path /obj/item/bouquet/stellar does not exist
ckeywhitelist = list("thedragmeme")

/datum/loadout_item/under/jumpsuit/paddedunder
name = "Feathered Serenity Suit"
item_path = /obj/item/clothing/under/padded
ckeywhitelist = list("thedragmeme")

/datum/loadout_item/under/jumpsuit/sweater_dress
name = "Virgin Killer Sweater"
item_path = /obj/item/clothing/under/sweater_dress
ckeywhitelist = list("thedragmeme")

/datum/loadout_item/suit/bomber_donor
name = "Old Hoodie"
item_path = /obj/item/clothing/suit/jacket/bomber_donor
ckeywhitelist = list("thedragmeme")

/datum/loadout_item/under/jumpsuit/paddedunder/alt
name = "Feathered Serenity Dress"
item_path = /obj/item/clothing/under/padded/alt
ckeywhitelist = list("snailomi")

/datum/loadout_item/neck/padded
name = "Feathered Serenity Cloak"
item_path = /obj/item/clothing/neck/padded
ckeywhitelist = list("thedragmeme", "SomeNetwork")

/datum/loadout_item/neck/padded/alt
name = "Feathered Serenity Cloak"
item_path = /obj/item/clothing/neck/padded/alt
ckeywhitelist = list("snailomi")

/datum/loadout_item/neck/padded/security
name = "Vanguard Cloak"
item_path = /obj/item/clothing/neck/padded/security
ckeywhitelist = list("actualvanguard")

/datum/loadout_item/gloves/padded
name = "Serenity Gloves"
item_path = /obj/item/clothing/gloves/padded
ckeywhitelist = list("thedragmeme", "snailomi")

/datum/loadout_item/shoes/padded
name = "Serenity Boots"
item_path = /obj/item/clothing/shoes/jackboots/padded
ckeywhitelist = list("thedragmeme")

/datum/loadout_item/under/jumpsuit/long_skirtleneck
name = "Tacticool Skirtleneck (Long)"
item_path = /obj/item/clothing/under/syndicate/tacticool/skirt/long
ckeywhitelist = list("HollandaiseSauce", "Latinfishy", "Tf4")

/datum/loadout_item/suit/ryddid
name = "The Ryddid"
item_path = /obj/item/clothing/suit/jacket/ryddid
ckeywhitelist = list("grunnyyy")

/datum/loadout_item/under/jumpsuit/draculass
name = "Draculass Dress"
item_path = /obj/item/clothing/under/costume/draculass
ckeywhitelist = list("grunnyyy", "joe_duhan")

/datum/loadout_item/neck/grunnyyycloak
name = "Black and Red cloak"
item_path = /obj/item/clothing/neck/cloak/grunnyyy
ckeywhitelist = list("grunnyyy")

/datum/loadout_item/gloves/hypnoring_coffee
name = "Hypnodemon's Ring"
item_path = /obj/item/clothing/gloves/ring/hypno/coffeepot
ckeywhitelist = list("coffeepot")

/datum/loadout_item/gloves/hypnoring_bippy
name = "Hypnodemon's Ring"
item_path = /obj/item/clothing/gloves/ring/hypno/bippys
ckeywhitelist = list("bippys")

/datum/loadout_item/shoes/rax_armadyne_boots
name = "Tactical Boots"
item_path = /obj/item/clothing/shoes/combat/rax
ckeywhitelist = list("raxraus")

/datum/loadout_item/suit/rax_peacekeeper_jacket
name = "Peacekeeper jacket"
item_path = /obj/item/clothing/suit/armor/vest/warden/rax
ckeywhitelist = list("raxraus")
restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/under/jumpsuit/rax_banded_uniform
name = "Banded Uniform"
item_path = /obj/item/clothing/under/rank/security/rax
ckeywhitelist = list("raxraus")
restricted_roles = list(JOB_BLUESHIELD, JOB_HEAD_OF_SECURITY, JOB_SECURITY_OFFICER, JOB_WARDEN, JOB_DETECTIVE, JOB_CORRECTIONS_OFFICER)

/datum/loadout_item/head/goldengoggles
name = "Steampunk Goggles"
item_path = /obj/item/clothing/glasses/welding/steampunk_goggles
ckeywhitelist = list("goldenalpharex")

/datum/loadout_item/under/jumpsuit/plasmaman_jax
name = "XuraCorp Biohazard Underfitting"
item_path = /obj/item/clothing/under/plasmaman/jax2
ckeywhitelist = list("candlejax")
restricted_roles = list(JOB_RESEARCH_DIRECTOR, JOB_SCIENTIST, JOB_SCIENCE_GUARD, JOB_VIROLOGIST, JOB_GENETICIST)

/datum/loadout_item/mask/cmcp_mask
name = "CMCP Mask"
item_path = /obj/item/clothing/mask/gas/CMCP_mask
ckeywhitelist = list("candlejax")

/datum/loadout_item/head/anahelm
name = "Azulean's Enviro-Helmet"
item_path = /obj/item/clothing/head/helmet/space/plasmaman/candlejax2
ckeywhitelist = list("candlejax")

/datum/loadout_item/under/jumpsuit/emissionsuit
name = "Emission's Suit"
item_path = /obj/item/clothing/under/plasmaman/candlejax
ckeywhitelist = list("candlejax")

/datum/loadout_item/mask/divemask_koru
name = "S.O.K.O. Gaiter"
item_path = /obj/item/clothing/mask/gas/signalis_gaiter
ckeywhitelist = list("koruu", "foxyandiknowit", "candlejax", "shyelf", "opportunerover22")

/datum/loadout_item/under/jumpsuit/divesuit_koru
name = "S.O.K.O. Bodysuit"
item_path = /obj/item/clothing/under/bodysuit_koruu
ckeywhitelist = list("koruu", "foxyandiknowit", "candlejax", "shyelf", "opportunerover22")

/datum/loadout_item/under/jumpsuit/anasuit
name = "Azulean's Enviro-Suit"
item_path = /obj/item/clothing/under/plasmaman/candlejax2
ckeywhitelist = list("candlejax")

/datum/loadout_item/mask/composite_filtration
name = "Composite Filtration Mask"
item_path = /obj/item/clothing/mask/gas/psycho_malice
ckeywhitelist = list("snakebittenn", "chillylobster", "candlejax", "theooz", "alvcyktor")

>>>>>>> 72a226822c2 (Adds donor items for thedragmeme (#4574))

Check failure on line 151 in modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0001: Invalid number

Check warning on line 151 in modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm

View workflow job for this annotation

GitHub Actions / Run Linters

OD0000: Error recovery had to skip to modular_nova/modules/loadouts/loadout_items/donator/personal/donator_personal.dm:152:8
/datum/loadout_item/suit/jacket
abstract_type = /datum/loadout_item/suit/jacket

Expand Down
Loading