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.

Sign up for GitHub

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

Jump to bottom

Niteman tweaks (mostly toward Nightmatrons) #790

Merged
merged 5 commits into from
Oct 1, 2024
Merged

Niteman tweaks (mostly toward Nightmatrons) #790

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9bed194
yeah
OctusGit Sep 25, 2024
abfc684
reverts Aasimar change
OctusGit Sep 30, 2024
c29ebbd
Merge remote-tracking branch 'upstream/main' into nitematron-bs
OctusGit Sep 30, 2024
1d94d30
Update armor.dmi
OctusGit Sep 30, 2024
26d8a87
Merge branch 'main' into nitematron-bs
ThePainkiller Oct 1, 2024
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
1 change: 1 addition & 0 deletions code/__DEFINES/jobs.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@
#define ARCHIVIST (1<<6)
#define MERCHANT (1<<7)
#define FELDSHER (1<<8)
#define NIGHTMAN (1<<9)

#define GARRISON (1<<1)

Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/rogueclothes/armor.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,8 +498,8 @@
desc = "A silken jacket discretely padded with leather on the inside."
body_parts_covered = CHEST|VITALS|LEGS
sleeved = 'icons/roguetown/clothing/onmob/armor.dmi'
allowed_sex = list(MALE)
allowed_race = list("human", "tiefling", "aasimar")
allowed_sex = list(MALE, FEMALE)
allowed_race = list("human", "tiefling","elf", "half-elf", "dark elf")
sellprice = 60


Expand Down
9 changes: 4 additions & 5 deletions code/modules/jobs/job_types/roguetown/nobility/nightman.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/datum/job/roguetown/niteman
title = "Niteman"
flag = JESTER
department_flag = PEASANTS
flag = NIGHTMAN
department_flag = NOBLEMEN
faction = "Station"
total_positions = 1
spawn_positions = 1
Expand All @@ -28,16 +28,16 @@

/datum/outfit/job/roguetown/niteman/pre_equip(mob/living/carbon/human/H)
..()
armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor/niteman
shoes = /obj/item/clothing/shoes/roguetown/shortboots
belt = /obj/item/storage/belt/rogue/leather/rope
beltr = /obj/item/keyring/niteman
beltl = /obj/item/rogueweapon/huntingknife
beltl = /obj/item/storage/belt/rogue/pouch/coins/mid
ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC)
ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC)
if(H.mind)
H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) // Need the strongarm to wrestle people out of the baths
H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) // Don't make me regret these levels.
H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE)
H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE)
Expand All @@ -58,4 +58,3 @@
armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/sailor
else
pants = /obj/item/clothing/under/roguetown/tights
armor = /obj/item/clothing/suit/roguetown/armor/armordress/alt
Binary file modified icons/roguetown/clothing/onmob/armor.dmi
View file
Open in desktop
Binary file not shown.
Loading