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

Bringing back Nitematron #1288

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
+22 −12
Open

Bringing back Nitematron #1288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95af824
Female + Races
Aegledis Feb 3, 2025
f989ede
Test1
Aegledis Feb 3, 2025
18b8612
Fixed
Aegledis Feb 4, 2025
8f43e75
Balance Fixes
Aegledis Feb 4, 2025
add6cf9
Whoopsies
Aegledis Feb 4, 2025
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
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 @@ -114,7 +114,7 @@
desc = "Favored by the female nobility, to maintain both vitality and good taste while out hunting."
icon_state = "armordress"
allowed_sex = list(FEMALE)
allowed_race = list("human", "tiefling", "elf", "aasimar", "abyssariad")
allowed_race = list("human", "tiefling", "elf", "aasimar", "abyssariad", "half-elf", "dark elf")
r_sleeve_status = SLEEVE_NORMAL
l_sleeve_status = SLEEVE_NORMAL
sellprice = VALUE_PADDED_DRESS
Expand Down Expand Up @@ -327,7 +327,7 @@
/obj/item/clothing/suit/roguetown/armor/leather/jacket/hand
name = "noble coat"
icon_state = "handcoat"
desc = "A quality silken coat, discretely lined with thin metal platr on the inside to protect its affluent wearer."
desc = "A quality silken coat, discretely lined with thin metal plate on the inside to protect its affluent wearer."
sellprice = VALUE_LEATHER_ARMOR_LORD

body_parts_covered = COVERAGE_ALL_BUT_ARMS
Expand Down
30 changes: 20 additions & 10 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,23 +1,25 @@
/datum/job/roguetown/niteman
title = "Niteman"
flag = NIGHTMAN
department_flag = TOWNERS
department_flag = NOBLEMEN
faction = "Station"
total_positions = 1
spawn_positions = 1
f_title = "Nitematron"

allowed_races = list(
"Humen",
"Dwarf",
"Elf",
"Half-Elf",
"Tiefling",
Copy link
Contributor

@LesPirouettes LesPirouettes Feb 4, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't mind female nitematrons but tiefling/delf nobility feels like a change that should be documented.

"Dark Elf",
"Aasimar"
)

tutorial = "Even nobles can be disgraced and fall on hard times, despite inheriting a fine bathhouse building. <br>\
For whatever reason you have traded your reputation for a supply of drugs and nitemaidens to employ and profit from. The licenses can be bought from the Feldsher, or just make a forgery yourself to save money. <br>\
Some accuse you of have connections with the Rogues and Bandits of the land but surely its just slander..."
tutorial = "You are renting out the bath-house in a joint operation with the Innkeep. Providing security for the bathwenches and helping them find work, or a troublemaking rake that the others hate to tolerate."

allowed_sexes = list(MALE)
allowed_sexes = list(MALE, FEMALE)
outfit = /datum/outfit/job/roguetown/niteman
display_order = JDO_NITEMAN
give_bank_account = 120
Expand Down Expand Up @@ -49,11 +51,19 @@
H.change_stat("speed", 1)
H.change_stat("intelligence", 1)
H.change_stat("perception", 2)
H.mind.teach_crafting_recipe(/datum/crafting_recipe/forgery_nitmaiden)
if(H.dna?.species)
if(H.dna.species.id == "human")
H.dna.species.soundpack_m = new /datum/voicepack/male/zeth()

H.mind.teach_crafting_recipe(/datum/crafting_recipe/forgery_nitmaiden)
if(H.gender == MALE)
pants = /obj/item/clothing/under/roguetown/trou/leather
armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
if(H.dna?.species)
if(H.dna.species.id == "human")
H.dna.species.soundpack_m = new /datum/voicepack/male/zeth()
if(H.dna.species.id == "elf")
armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
if(H.dna.species.id == "dwarf")
armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/niteman
else
pants = /obj/item/clothing/under/roguetown/tights
/* ................. Unique Nitemaster recipes ................... */
/datum/crafting_recipe/forgery_nitmaiden
name = "Forge nitemaiden license"
Expand Down
Loading