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

Adds Dwarves to Royal Family (Excluding Kings) #786

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open
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
2 changes: 1 addition & 1 deletion code/modules/clothing/rogueclothes/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@
blocksound = SOFTHIT
resistance_flags = FLAMMABLE
allowed_sex = list(FEMALE)
allowed_race = list("human", "tiefling", "elf", "aasimar")
allowed_race = list("human", "tiefling", "elf", "aasimar","dwarf")
blade_dulling = DULLING_BASHCHOP
break_sound = 'sound/foley/cloth_rip.ogg'
drop_sound = 'sound/foley/dropsound/cloth_drop.ogg'
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/rogueclothes/cloaks.dm
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@
nodismemsleeves = TRUE
inhand_mod = TRUE
// allowed_sex = list("male")
allowed_race = list("human", "tiefling", "elf", "aasimar")
allowed_race = list("human", "tiefling", "elf", "aasimar", "dwarf")
detail_tag = "_det"
detail_color = CLOTHING_PURPLE

Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/roguetown/apprentices/prince.dm
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@
f_title = "Princess"
allowed_races = list(
"Humen",
"Half-Elf"
"Half-Elf",
"Dwarf"
)
allowed_sexes = list(MALE, FEMALE)
allowed_ages = list(AGE_ADULT)
Expand Down
3 changes: 2 additions & 1 deletion code/modules/jobs/job_types/roguetown/nobility/lady.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@
allowed_races = list(
"Humen",
"Elf",
"Half-Elf"
"Half-Elf",
"Dwarf"
)
tutorial = "Picked out of your political value rather than likely any form of love, you have become the King's most trusted confidant and likely friend throughout your marriage. Your loyalty and, perhaps, love; will be tested this day. For the daggers that threaten your beloved are as equally pointed at your own throat."

Expand Down
Binary file modified icons/roguetown/clothing/onmob/armor.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/cloaks.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/feet.dmi
Binary file not shown.
Binary file modified icons/roguetown/clothing/onmob/helpers/sleeves_armor.dmi
Binary file not shown.