From 95b170daafd70274ef2ccf78723d961da9cd6bc1 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:22:13 -0800 Subject: [PATCH 1/9] compiles --- code/__DEFINES/jobs.dm | 4 +- code/__DEFINES/migrants.dm | 2 + code/__DEFINES/roguetown.dm | 10 - code/_globalvars/migrants.dm | 16 + code/_onclick/hud/screen_objects.dm | 5 + code/controllers/subsystem/rogue/migration.dm | 364 ++++++++++++++++++ .../drifter_menu/drifter_queue_menu.dm | 129 ------- .../drifter_menu/drifter_queue_menu_build.dm | 51 --- .../drifter_queue/drifter_queue.dm | 232 ----------- .../drifter_queue/drifter_queue_helpers.dm | 142 ------- .../drifter_queue/drifter_queue_scheduling.dm | 60 --- .../drifter_waves/_drifter_wave.dm | 99 ----- .../drifter_waves/drifter_wave.dm | 37 -- .../role_class_handler/role_class_handler.dm | 39 +- code/controllers/subsystem/ticker.dm | 1 - code/datums/migrants/migrant_assignment.dm | 7 + code/datums/migrants/migrant_job.dm | 13 + code/datums/migrants/migrant_pref.dm | 68 ++++ code/datums/migrants/migrant_role.dm | 32 ++ code/datums/migrants/migrant_wave.dm | 115 ++++++ code/datums/migrants/waves/heartfell_wave.dm | 314 +++++++++++++++ code/game/gamemodes/game_mode.dm | 5 +- code/modules/admin/admin_verbs.dm | 1 + code/modules/client/preferences.dm | 30 +- code/modules/jobs/job_types/_job.dm | 6 - .../roguetown/adventurer/DRIFTERZ.dm | 41 -- .../roguetown/adventurer/adventurer.dm | 3 + .../adventurer/types/combat/rare/heartfelt.dm | 2 +- .../types/combat/rare/heartfelthand.dm | 2 +- code/modules/jobs/jobs.dm | 1 - .../modules/mob/dead/new_player/new_player.dm | 22 +- stonekeep.dme | 17 +- 32 files changed, 996 insertions(+), 874 deletions(-) create mode 100644 code/__DEFINES/migrants.dm create mode 100644 code/_globalvars/migrants.dm create mode 100644 code/controllers/subsystem/rogue/migration.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_scheduling.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/_drifter_wave.dm delete mode 100644 code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/drifter_wave.dm create mode 100644 code/datums/migrants/migrant_assignment.dm create mode 100644 code/datums/migrants/migrant_job.dm create mode 100644 code/datums/migrants/migrant_pref.dm create mode 100644 code/datums/migrants/migrant_role.dm create mode 100644 code/datums/migrants/migrant_wave.dm create mode 100644 code/datums/migrants/waves/heartfell_wave.dm delete mode 100644 code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm diff --git a/code/__DEFINES/jobs.dm b/code/__DEFINES/jobs.dm index 3975adc4e0..c74fb9b49e 100644 --- a/code/__DEFINES/jobs.dm +++ b/code/__DEFINES/jobs.dm @@ -143,7 +143,7 @@ #define ADVENTURER (1<<9) #define COOK (1<<10) #define GRABBER (1<<11) -#define WAVE_DRIFTER (1<<16) +#define MIGRANT (1<<16) #define APPRENTICES (1<<5) @@ -222,7 +222,7 @@ #define JDO_ADVENTURER 32.1 #define JDO_PILGRIM 32.2 -#define JDO_DRIFTER 32.3 +#define JDO_MIGRANT 32.3 #define JDO_MERCENARY 33 diff --git a/code/__DEFINES/migrants.dm b/code/__DEFINES/migrants.dm new file mode 100644 index 0000000000..8b4cd794f4 --- /dev/null +++ b/code/__DEFINES/migrants.dm @@ -0,0 +1,2 @@ +#define MIGRANT_ROLE(role_type) GLOB.migrant_roles[role_type] +#define MIGRANT_WAVE(wave_type) GLOB.migrant_waves[wave_type] diff --git a/code/__DEFINES/roguetown.dm b/code/__DEFINES/roguetown.dm index a601e1a984..6dc6dbffd5 100644 --- a/code/__DEFINES/roguetown.dm +++ b/code/__DEFINES/roguetown.dm @@ -113,16 +113,6 @@ GLOBAL_LIST_EMPTY(job_respawn_delays) #define CTAG_GARRISON "CAT_GARRISON" #define CTAG_ADEPT "CAT_ADEPT" // Used for Adept class selection -/* - String category tags - This time for the drifter waves, used for sorting and scheduling purposes -*/ -#define DTAG_ALLWAVES "CAT_ALLWAVES" // Another define for jus the basic allclass -#define DTAG_DISABLED "CAT_DISABLED" // Disabled, do not use -#define DTAG_FILLERS "CAT_FILLER" // If we have nothing better to do, time for filler -#define DTAG_ANTAGS "CAT_ANTAGS" // A catchall for antag groups -#define DTAG_BANDITS "CAT_BANDITS" // some bandits I guess <- Disabled; issues with spawning bandits as drifters - /* Defines for the triumph buy datum categories */ diff --git a/code/_globalvars/migrants.dm b/code/_globalvars/migrants.dm new file mode 100644 index 0000000000..184330b0de --- /dev/null +++ b/code/_globalvars/migrants.dm @@ -0,0 +1,16 @@ +GLOBAL_LIST_INIT(migrant_waves, build_migrant_waves()) +GLOBAL_LIST_INIT(migrant_roles, build_migrant_roles()) +/proc/build_migrant_waves() + . = list() + for(var/type in typesof(/datum/migrant_wave)) + if(is_abstract(type)) + continue + .[type] = new type() + return . +/proc/build_migrant_roles() + . = list() + for(var/type in typesof(/datum/migrant_role)) + if(is_abstract(type)) + continue + .[type] = new type() + return . diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index de9fc2936e..54080ddc88 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -774,6 +774,11 @@ qdel(src) return var/mob/living/carbon/human/H = hud.mymob + if(H.mind && H.mind.antag_datums) + for(var/datum/antagonist/D in H.mind.antag_datums) + if(istype(D, /datum/antagonist/vampirelord) || istype(D, /datum/antagonist/vampire) || istype(D, /datum/antagonist/bandit)) + qdel(src) + return if(H.advsetup) alpha = 0 icon = 'icons/mob/advsetup.dmi' diff --git a/code/controllers/subsystem/rogue/migration.dm b/code/controllers/subsystem/rogue/migration.dm new file mode 100644 index 0000000000..a349ae395f --- /dev/null +++ b/code/controllers/subsystem/rogue/migration.dm @@ -0,0 +1,364 @@ +SUBSYSTEM_DEF(migrants) + name = "Migrants" + wait = 2 SECONDS + runlevels = RUNLEVEL_GAME + var/wave_number = 1 + var/current_wave = null + var/time_until_next_wave = 2 MINUTES + var/wave_timer = 0 + var/time_between_waves = 3 MINUTES + var/time_between_fail_wave = 90 SECONDS + var/wave_wait_time = 30 SECONDS + var/list/spawned_waves = list() +/datum/controller/subsystem/migrants/Initialize() + return ..() +/datum/controller/subsystem/migrants/fire(resumed) + process_migrants(2 SECONDS) + update_ui() +/datum/controller/subsystem/migrants/proc/set_current_wave(wave_type, time) + current_wave = wave_type + wave_timer = time +/datum/controller/subsystem/migrants/proc/process_migrants(dt) + if(current_wave) + process_current_wave(dt) + else + process_next_wave(dt) +/datum/controller/subsystem/migrants/proc/process_current_wave(dt) + wave_timer -= dt + if(wave_timer > 0) + return + // Try and spawn wave + var/success = try_spawn_wave() + if(success) + log_game("Migrants: Successfully spawned wave: [current_wave]") + else + log_game("Migrants: FAILED to spawn wave: [current_wave]") + // Unset some values, increment wave number if success + if(success) + wave_number++ + var/datum/migrant_wave/wave = MIGRANT_WAVE(current_wave) + set_current_wave(null, 0) + if(success) + time_until_next_wave = time_between_waves + else + if(wave.downgrade_wave) + set_current_wave(wave.downgrade_wave, wave_wait_time) + else + time_until_next_wave = time_between_fail_wave +/datum/controller/subsystem/migrants/proc/try_spawn_wave() + var/datum/migrant_wave/wave = MIGRANT_WAVE(current_wave) + /// Create initial assignment list + var/list/assignments = list() + /// Populate it + for(var/role_type in wave.roles) + var/amount = wave.roles[role_type] + for(var/i in 1 to amount) + assignments += new /datum/migrant_assignment(role_type) + /// Shuffle assignments so role rolling is not consistent + assignments = shuffle(assignments) + var/list/active_migrants = get_active_migrants() + active_migrants = shuffle(active_migrants) + var/list/picked_migrants = list() + if(!length(active_migrants)) + return FALSE + /// Try to assign priority players to positions + for(var/datum/migrant_assignment/assignment as anything in assignments) + if(!length(active_migrants)) + break // Out of migrants, we're screwed and will fail + if(assignment.client) + continue + var/list/priority = get_priority_players(active_migrants, assignment.role_type) + if(!length(priority)) + continue + var/client/picked + priority = shuffle(priority) + for(var/client/client as anything in priority) + if(!can_be_role(client, assignment.role_type)) + continue + picked = client + break + if(!picked) + continue + active_migrants -= picked + assignment.client = picked + picked_migrants += picked + /// Assign rest of the players to positions + for(var/datum/migrant_assignment/assignment as anything in assignments) + if(!length(active_migrants)) + break // Out of migrants, we're screwed and will fail + if(assignment.client) + continue + var/client/picked + for(var/client/client as anything in active_migrants) + if(!can_be_role(client, assignment.role_type)) + continue + picked = client + break + if(!picked) + continue + active_migrants -= picked + assignment.client = picked + picked_migrants += picked + /// Find spawn points for the assignments + var/turf/spawn_location = get_spawn_turf_for_job(wave.spawn_landmark) + var/atom/fallback_location = spawn_location + var/list/turfs = get_safe_turfs_around_location(spawn_location) + for(var/i in 1 to turfs.len) + var/turf/turf = turfs[i] + if(assignments.len < i) + break + var/datum/migrant_assignment/assignment = assignments[i] + assignment.spawn_location = turf + /// See if anything went wrong and return FALSE if it did + for(var/datum/migrant_assignment/assignment as anything in assignments) + if(!assignment.client) + return FALSE + if(!assignment.spawn_location) + assignment.spawn_location = fallback_location + /// At this point everything is GOOD and SWELL, we want to spawn the wave + /// Unset their pref so if they respawn they wont get yoinked into migrants immediately + for(var/client/client as anything in picked_migrants) + client.prefs.migrant.post_spawn() + /// Spawn the migrants, hooray + for(var/datum/migrant_assignment/assignment as anything in assignments) + spawn_migrant(wave, assignment) + // Increment wave spawn counter + var/used_wave_type = wave.type + if(wave.shared_wave_type) + used_wave_type = wave.shared_wave_type + if(!spawned_waves[used_wave_type]) + spawned_waves[used_wave_type] = 0 + spawned_waves[used_wave_type] += 1 + return TRUE +/datum/controller/subsystem/migrants/proc/get_safe_turfs_around_location(atom/location) + var/list/turfs = list() + var/turf/turfloc = get_turf(location) + for(var/turf/turf as anything in RANGE_TURFS(2, turfloc)) + if(!isfloorturf(turf)) + continue + if(islava(turf)) + continue + if(is_blocked_turf(turf)) + continue + turfs += turf + turfs = shuffle(turfs) + return turfs +/datum/controller/subsystem/migrants/proc/spawn_migrant(datum/migrant_wave/wave, datum/migrant_assignment/assignment) + var/rank = "Migrant" + var/mob/dead/new_player/newplayer = assignment.client.mob + var/ckey = assignment.client.ckey + SSjob.AssignRole(newplayer, rank, TRUE) + var/mob/living/character = newplayer.create_character(TRUE) //creates the human and transfers vars and mind + character.islatejoin = TRUE + SSjob.EquipRank(character, rank, TRUE) + var/datum/migrant_role/role = MIGRANT_ROLE(assignment.role_type) + /// copy pasta from AttemptLateSpawn(rank) further on TODO put it in a proc and use in both places + /// Fade effect + var/atom/movable/screen/splash/Spl = new(character.client, TRUE) + Spl.Fade(TRUE) + character.update_parallax_teleport() + var/mob/living/carbon/human/humanc + if(ishuman(character)) + humanc = character //Let's retypecast the var to be human, + SSticker.minds += character.mind + GLOB.joined_player_list += character.ckey + if(humanc) + var/fakekey = character.ckey + if(ckey in GLOB.anonymize) + fakekey = get_fake_key(character.ckey) + GLOB.character_list[character.mobid] = "[fakekey] was [character.real_name] ([rank])
" + GLOB.character_ckey_list[character.real_name] = character.ckey + log_character("[character.ckey] ([fakekey]) - [character.real_name] - [rank]") + if(GLOB.respawncounts[character.ckey]) + var/AN = GLOB.respawncounts[character.ckey] + AN++ + GLOB.respawncounts[character.ckey] = AN + else + GLOB.respawncounts[character.ckey] = 1 + /// And back to non copy pasta code + character.forceMove(assignment.spawn_location) + to_chat(character, span_alertsyndie("I am a [role.name]!")) + to_chat(character, span_notice(wave.greet_text)) + to_chat(character, span_notice(role.greet_text)) + if(role.outfit) + var/datum/outfit/outfit = new role.outfit() + outfit.equip(character) + if(role.antag_datum) + character.mind.add_antag_datum(role.antag_datum) + // Adding antag datums can move your character to places, so here's a bandaid + character.forceMove(assignment.spawn_location) + if(role.grant_lit_torch) + grant_lit_torch(character) + role.after_spawn(character) + if(role.advclass_cat_rolls) + SSrole_class_handler.setup_class_handler(character, role.advclass_cat_rolls) + hugboxify_for_class_selection(character) +/datum/controller/subsystem/migrants/proc/get_priority_players(list/players, role_type) + var/list/priority = list() + for(var/client/client as anything in players) + if(!(role_type in client.prefs.migrant.role_preferences)) + continue + priority += client + return priority +/datum/controller/subsystem/migrants/proc/can_be_role(client/player, role_type) + var/datum/migrant_role/role = MIGRANT_ROLE(role_type) + if(!player) + return FALSE + if(!player.prefs) + return FALSE + var/datum/preferences/prefs = player.prefs + if(role.allowed_races && !(prefs.pref_species.name in role.allowed_races)) + return FALSE + if(role.allowed_sexes && !(prefs.gender in role.allowed_sexes)) + return FALSE + if(role.allowed_ages && !(prefs.age in role.allowed_ages)) + return FALSE + return TRUE +/datum/controller/subsystem/migrants/proc/process_next_wave(dt) + time_until_next_wave -= dt + if(time_until_next_wave > 0) + return + var/wave_type = roll_wave() + if(wave_type) + log_game("Migrants: Rolled wave: [wave_type]") + set_current_wave(wave_type, wave_wait_time) + + time_until_next_wave = time_between_fail_wave +/datum/controller/subsystem/migrants/proc/roll_wave() + var/list/available_weighted_waves = list() + var/active_migrants = get_active_migrant_amount() + var/active_players = get_round_active_players() + for(var/wave_type in GLOB.migrant_waves) + var/datum/migrant_wave/wave = MIGRANT_WAVE(wave_type) + if(!wave.can_roll) + continue + if(!isnull(wave.min_active) && active_migrants < wave.min_active) + continue + if(!isnull(wave.max_active) && active_migrants > wave.max_active) + continue + if(!isnull(wave.min_pop) && active_players < wave.min_pop) + continue + if(!isnull(wave.max_pop) && active_players > wave.max_pop) + continue + if(!isnull(wave.max_spawns)) + var/used_wave_type = wave.type + if(wave.shared_wave_type) + used_wave_type = wave.shared_wave_type + if(spawned_waves[used_wave_type] && spawned_waves[used_wave_type] >= wave.max_spawns) + continue + available_weighted_waves[wave_type] = wave.weight + if(!length(available_weighted_waves)) + return null + return pickweight(available_weighted_waves) +/datum/controller/subsystem/migrants/proc/update_ui() + for(var/client/client as anything in get_all_migrants()) + client.prefs.migrant.show_ui() +/datum/controller/subsystem/migrants/proc/get_active_migrant_amount() + var/list/migrants = get_active_migrants() + if(migrants) + return migrants.len + return 0 +/datum/controller/subsystem/migrants/proc/get_stars_on_role(role_type) + var/stars = 0 + var/list/active_migrants = get_active_migrants() + if(active_migrants) + for(var/client/client as anything in active_migrants) + if(!(role_type in client.prefs.migrant.role_preferences)) + continue + stars++ + return stars +/datum/controller/subsystem/migrants/proc/get_round_active_players() + var/active = 0 + for(var/mob/player_mob as anything in GLOB.player_list) + if(!player_mob.client) + continue + if(player_mob.stat == DEAD) //If not alive + continue + if(player_mob.client.is_afk()) //If afk + continue + if(!ishuman(player_mob)) + continue + active++ + return active +/// Returns a list of all newplayer clients with active migrant pref +/datum/controller/subsystem/migrants/proc/get_active_migrants() + var/list/migrants = list() + for(var/mob/dead/new_player/player as anything in GLOB.new_player_list) + if(!player.client) + continue + if(!player.client.prefs) + continue + if(!player.client.prefs.migrant.active) + continue + migrants += player.client + return migrants +/// Returns a list of all newplayer clients +/datum/controller/subsystem/migrants/proc/get_all_migrants() + var/list/migrants = list() + for(var/mob/dead/new_player/player as anything in GLOB.new_player_list) + if(!player.client) + continue + if(!player.client.prefs) + continue + migrants += player.client + return migrants +/client/proc/admin_force_next_migrant_wave() + set category = "GameMaster" + set name = "Force Migrant Wave" + if(!holder) + return + . = TRUE + var/mob/user = usr + message_admins("Admin [key_name_admin(user)] is forcing the next migrant wave.") + var/picked_wave_type = input(user, "Choose migrant wave to force:", "Migrants") as null|anything in GLOB.migrant_waves + if(!picked_wave_type) + return + message_admins("Admin [key_name_admin(user)] forced next migrant wave: [picked_wave_type] (Arrival: 1 Minute)") + log_game("Admin [key_name_admin(user)] forced next migrant wave: [picked_wave_type] (Arrival: 1 Minute)") + SSmigrants.set_current_wave(picked_wave_type, (1 MINUTES)) +/proc/get_spawn_turf_for_job(jobname) + var/list/landmarks = list() + for(var/obj/effect/landmark/start/sloc as anything in GLOB.start_landmarks_list) + if(!(jobname in sloc.jobspawn_override)) + continue + landmarks += sloc + if(!length(landmarks)) + return null + landmarks = shuffle(landmarks) + return get_turf(pick(landmarks)) +/proc/hugboxify_for_class_selection(mob/living/carbon/human/character) + character.advsetup = 1 + character.invisibility = INVISIBILITY_MAXIMUM + character.become_blind("advsetup") + if(GLOB.adventurer_hugbox_duration) + ///FOR SOME RETARDED FUCKING REASON THIS REFUSED TO WORK WITHOUT A FUCKING TIMER IT JUST FUCKED SHIT UP + addtimer(CALLBACK(character, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_start)), 1) + +/proc/grant_lit_torch(mob/living/carbon/human/character) + var/obj/item/flashlight/flare/torch/torch = new() + torch.spark_act() + character.put_in_hands(torch, forced = TRUE) + +/mob/living/carbon/human/proc/adv_hugboxing_start() + to_chat(src, span_warning("I will be in danger once I start moving.")) + status_flags |= GODMODE + ADD_TRAIT(src, TRAIT_PACIFISM, "hugbox") + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(adv_hugboxing_moved)) + //Lies, it goes away even if you don't move after enough time + if(GLOB.adventurer_hugbox_duration_still) + addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration_still) + +/mob/living/carbon/human/proc/adv_hugboxing_moved() + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + to_chat(src, span_danger("I have [DisplayTimeText(GLOB.adventurer_hugbox_duration)] to begone!")) + addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration) + +/mob/living/carbon/human/proc/adv_hugboxing_end() + if(QDELETED(src)) + return + //hugbox already ended + if(!(status_flags & GODMODE)) + return + status_flags &= ~GODMODE + REMOVE_TRAIT(src, TRAIT_PACIFISM, "hugbox") + to_chat(src, span_danger("My joy is gone! Danger surrounds me.")) diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu.dm deleted file mode 100644 index 0f43aacff0..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu.dm +++ /dev/null @@ -1,129 +0,0 @@ -/* - Well, we were on the preferences menu, but now we are on our own datum yet again -*/ -/datum/drifter_queue_menu - var/client/linked_client - -/datum/drifter_queue_menu/proc/first_show_drifter_queue_menu() - var/datum/asset/thicc_assets = get_asset_datum(/datum/asset/simple/stonekeep_drifter_queue_menu_slop_layout) - thicc_assets.send(linked_client) - show_drifter_queue_menu() - -/datum/drifter_queue_menu/proc/show_drifter_queue_menu() - if(!linked_client) - return - //Opening tags and empty head - var/data = {" - - - - - - - - - "} - // - //Body tag start - data += "" - data += "
Time to next excursion:[SSrole_class_handler.time_left_until_next_wave_string]
" - data += "
" - if(linked_client in SSrole_class_handler.drifter_queue_joined_clients) - data += "LEAVE QUEUE" - else - data += "ENTER QUEUE" - data += "
" - data += "
" - data += "
Forecast:

" - /* - I have decided to just display the current and the next wave - Three would mean people would get too much heads up information and be more likely to afk than normal - */ - - data += "" - - - if(SSrole_class_handler.drifter_wave_schedule.len) - // Amount of iterations - var/current_iteration = 0 - // Amount of waves to display - var/max_to_display = 2 - for(var/i = SSrole_class_handler.current_wave_number, SSrole_class_handler.drifter_wave_schedule.len >= i, i++) - var/datum/drifter_wave/cur_datum = SSrole_class_handler.drifter_wave_schedule[i] - current_iteration++ - - data += "" - switch(current_iteration) - if(1) - //data += "" - data += "" - if(2) - data += "" - else - data += "" - - data += "" - if(current_iteration == 1) - data += "" - else - data += "" - data += "" - - if(current_iteration >= max_to_display) - break - - data += "
" - //data += "NOW: NEXT: [i]: [cur_datum.wave_type_name][cur_datum.wave_type_tooltip][SSrole_class_handler.drifter_wave_FULLY_entered_clients.len]/[cur_datum.maximum_playercount]0/[cur_datum.maximum_playercount]
" - data += "
" - - data += "" - data += "[SSrole_class_handler.drifter_queue_player_tbl_string]" - data += "
" - - // Script chunk as this will insure something doesn't happen due to the fact we are reloading the menu repeatedly - data += {" - - "} - //Closing Tags - data += {" - - - "} - - linked_client << browse(data, "window=drifter_queue;size=400x430;can_close=1;can_minimize=0;can_maximize=0;can_resize=1;titlebar=1") - // We setup the href_list "close" call if they hit the x on the top right - for(var/i in 1 to 10) - if(!linked_client) - break - if(winexists(linked_client, "drifter_queue")) - winset(linked_client, "drifter_queue", "on-close=\".windowclose [REF(src)]\"") - break - -/datum/drifter_queue_menu/proc/ForceCloseMenus() - if(linked_client) - linked_client << browse(null, "window=drifter_queue") - -/datum/drifter_queue_menu/Topic(href, list/href_list) - . = ..() - if(href_list["join_queue"]) - //if(!SSrole_class_handler.drifter_queue_delayed) - SSrole_class_handler.attempt_to_add_client_to_drifter_queue(linked_client) - show_drifter_queue_menu() - - if(href_list["leave_queue"]) - SSrole_class_handler.remove_client_from_drifter_queue(linked_client) - show_drifter_queue_menu() - - if(href_list["close"]) - SSrole_class_handler.cleanup_drifter_queue(linked_client) - return diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm deleted file mode 100644 index 543c44dd3e..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_menu/drifter_queue_menu_build.dm +++ /dev/null @@ -1,51 +0,0 @@ -// player table for the html menus -/datum/controller/subsystem/role_class_handler/proc/rebuild_drifter_html_table() - if(!drifter_wave_FULLY_entered_clients.len) - drifter_queue_player_tbl_string = "" - return - - var/data - // Wave entrants - var/on_playa_num = 1 - var/total_rows = ceil(drifter_wave_FULLY_entered_clients.len/2) - var/row_cellcount = 2 - if(drifter_wave_FULLY_entered_clients.len < 2) - row_cellcount = 1 - for(var/i in 1 to total_rows) - data += "" - - for(var/ii in 1 to row_cellcount) - var/client/C = drifter_wave_FULLY_entered_clients[on_playa_num] - data += "[C.prefs.real_name]" - on_playa_num++ - if(on_playa_num > drifter_wave_FULLY_entered_clients.len) - break - - data += "" - - - // One building of the motherfuckin table per iteration - drifter_queue_player_tbl_string = data - -// Time string for the html menus -/datum/controller/subsystem/role_class_handler/proc/rebuild_drifter_time_string() - if(!drifter_queue_enabled) - time_left_until_next_wave_string = "DISABLED" - return - - if(drifter_queue_delayed) - time_left_until_next_wave_string = "DELAYED" - return - - var/time_left = max(0, next_drifter_mass_release_time - world.time) - var/seconds = round(time_left/10) - var/minutes = round(seconds/60) - - if(minutes) - seconds = seconds-minutes*60 - if(10 > seconds) - seconds = "0[seconds]" - if(10 > minutes) - minutes = "0[minutes]" - time_left_until_next_wave_string = "[minutes]:[seconds]" - diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue.dm deleted file mode 100644 index e09c4ce5a1..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue.dm +++ /dev/null @@ -1,232 +0,0 @@ -/* - Drifter Queue Shit, role_class_handler subsystem except hopefully most to all of the drifter queue shit is in here -*/ -/datum/controller/subsystem/role_class_handler -/* - assc list of ckeys linked to drifter queue menus if they got one which have client refs on them - ex: drifter_queue_menuss[ckey] = /datum/drifter_queue_menu - contents: drifter_queue_menus = list("ckey" = /datum/drifter_queue_menu, "ckey2" = /datum/drifter_queue_menu,... etc) -*/ - var/list/drifter_queue_menus = list() - - // Set this to false manually to stop the system, if you want to start the system call toggle_drifter_queue() - var/drifter_queue_enabled = FALSE - // Whether we are currently delayed, which stops the actual wave handling segment from firing - var/drifter_queue_delayed = TRUE - -/* - WORKING VARS -*/ - // How many drifters have entered into the round over the entire course of it - var/total_amount_of_drifters_entered_into_round = 0 - // ref to the current wave - var/datum/drifter_wave/current_wave - // Schedule of drifter waves - var/list/drifter_wave_schedule = list() - // List of clients who are currently queued - var/list/drifter_queue_joined_clients = list() - // List of clients who are set to be sent out with the wave - var/list/drifter_wave_FULLY_entered_clients = list() - // Number of waves we keep scheduled past the current one - var/drifter_wave_schedule_buffer = 2 - // Next time we attempt to process a wave/joined clients - var/next_drifter_mass_release_time = 0 - // Current wave number we are on - var/current_wave_number = 1 - - // Whether its time for a total refresh (sorry I don't feel like updating the damn table itself) - var/queue_total_browser_update = FALSE - // Whether its time to update the browser table - var/next_queue_table_browser_update_time - var/queue_table_browser_update = FALSE - // String vars for display menus - var/drifter_queue_player_tbl_string = "" - var/time_left_until_next_wave_string = "DISABLED" - // List of menu datums that we are currently processing in the fire() var on this subsystem - var/list/currentrun = list() - -/* - Hey we got somethin to keep track of now, which is drifter queue - haha -*/ -/datum/controller/subsystem/role_class_handler/fire(resumed = 0) - if(!drifter_queue_enabled) - can_fire = FALSE - return - - if(!resumed) - src.currentrun = drifter_queue_menus.Copy() - - // Rebuild the timer string - rebuild_drifter_time_string() -/* - LOOP SEGMENT - Here is where we handle a majority of the normal menu updates -*/ - //cache for sanic speed (lists are references anyways) - var/list/currentrun = src.currentrun - while(currentrun.len) - var/current_ckey = currentrun[currentrun.len] - var/datum/drifter_queue_menu/current_menu = currentrun[current_ckey] - currentrun.len-- - - // If the datum has no linked client just remove it - if(!current_menu.linked_client) - drifter_queue_menus.Remove(current_ckey) - qdel(current_menu) - continue - - var/client/target_client = current_menu.linked_client - // Refresh timer - target_client << output(url_encode(time_left_until_next_wave_string), "drifter_queue.browser:update_timer") - - // Whether its time to refresh the webpage for someone - if(queue_total_browser_update) - current_menu.show_drifter_queue_menu() - - // Whether its time to update the player table and playercount for the waves - if(queue_table_browser_update) - // This function wants the lefthand current wave player number and then the current table html - target_client << output(list2params(list("[drifter_wave_FULLY_entered_clients.len]", drifter_queue_player_tbl_string)), "drifter_queue.browser:update_playersegments") - - if(MC_TICK_CHECK) - return - - // Make sure to set the table/browser refresh to off after we are done - if(queue_total_browser_update) - queue_total_browser_update = FALSE - if(queue_table_browser_update) - queue_table_browser_update = FALSE - -/* - PREGAME CUCKSTOPPER - Aka we don't want people to join queue and then click ready and stay in queue -*/ - // You will not be in drifter queue and adversely also join regular queue dickhead - if(Master.current_runlevel == RUNLEVEL_LOBBY) - for(var/client/target_client in drifter_queue_joined_clients) - var/mob/dead/new_player/pregame_retard = target_client.mob - if(pregame_retard.ready == PLAYER_READY_TO_PLAY) - drifter_queue_joined_clients -= target_client - - rebuild_drifter_html_table() - - for(var/itr_ckeys in drifter_queue_menus) - if(itr_ckeys != target_client.ckey) - continue - var/datum/drifter_queue_menu/fuckyou = drifter_queue_menus[itr_ckeys] - fuckyou.show_drifter_queue_menu() - - // If we are delayed just stop here - if(drifter_queue_delayed) - return - -/* - WAVE DEPLOYMENT SEGMENT - Aka we are trying to deploy all the sick cunts in the wave -*/ - if(world.time >= next_drifter_mass_release_time) - //to_chat(world, "Release Drifters") - - if(!current_wave) - return - - if(drifter_wave_schedule.len >= current_wave_number+1) - var/datum/drifter_wave/next_wave = drifter_wave_schedule[current_wave_number+1] - next_drifter_mass_release_time = world.time + next_wave.wave_delay_time - else - next_drifter_mass_release_time = world.time + current_wave.wave_delay_time - - if(drifter_wave_FULLY_entered_clients.len) - current_wave.build_dropzone() - if(!current_wave.drifter_dropzone_targets) - message_admins("DRIFTER QUEUE TRIED TO FIRE WAVE WITH NO DROPZONE") - return - - var/list/temp_dropoff_refs = current_wave.drifter_dropzone_targets.Copy() - for(var/client/target_client in drifter_wave_FULLY_entered_clients) - if(!check_drifterwave_restrictions(target_client)) // Alas, I be feelin lazy fuck you ppl - continue - var/mob/living/character = process_drifter_wave_client(target_client) - if(character) // plz do not runtime here ok - var/turf/picked_turf - // Do our best to make sure our guys don't spawn ontop of each other - if(temp_dropoff_refs) - picked_turf = pick(temp_dropoff_refs) - temp_dropoff_refs -= picked_turf - else // And if we can't we will just do it neways ok - picked_turf = current_wave.drifter_dropzone_targets - - character.forceMove(picked_turf) - current_wave.post_character_handling(character) - // We do some tracking for funsies - total_amount_of_drifters_entered_into_round++ - - drifter_wave_FULLY_entered_clients.Cut() - - queue_total_browser_update = TRUE - - handle_drifter_wave_scheduling() - current_wave_number++ - - - - -// It would be my hope that anything going through here starts off as a /mob/dead/new_player -// Otherwise I will have to copypaste a ton of shit -// Also as you can see I already copy and pasted a ton of shit located on mob/dead/new_player/AttemptLateSpawn() -/datum/controller/subsystem/role_class_handler/proc/process_drifter_wave_client(client/target_client) - var/mob/dead/new_player/ourguy = target_client.mob - if(!ourguy) - message_admins("DRIFTER QUEUE HAS BROKEN AND WE GOT SOME GUY WHO AIN'T ON CHAR SETUP! SHIIIET") - return - - // you could technically have a wave of any fuckin job if you wanted ironically - var/rank = current_wave.job_rank - - // The important segments of SSjob's AssignRole, the only thing we are missing is incrementing the jobcount which we will not do for immigrants - ourguy.mind.assigned_role = rank - SSjob.unassigned -= ourguy - - // This one is fine - var/mob/living/character = ourguy.create_character(TRUE) //creates the human and transfers vars and mind - character.islatejoin = TRUE - - // In the offchance you want a way to just force some specific clown azz outfits onto people and not deal in job datums. - if(current_wave.bypass_job_and_force_this_outfit_on) - var/mob/living/carbon/human/HEH = character - if(HEH) - HEH.equipOutfit(current_wave.bypass_job_and_force_this_outfit_on) - else - var/equip = SSjob.EquipRank(character, rank, TRUE) - //Theres many ways to go about it, but if you want to turn someone into some other shit, and decide to look at cyborg.dm - //You can just return a mob in the job's equip datum, and this will help it. - if(isliving(equip)) - character = equip - - var/atom/movable/screen/splash/Spl = new(character.client, TRUE) - Spl.Fade(TRUE) - character.update_parallax_teleport() - - SSticker.minds += character.mind - GLOB.joined_player_list += character.ckey - - var/fakekey = character.ckey - if(target_client.ckey in GLOB.anonymize) - fakekey = get_fake_key(character.ckey) - - GLOB.character_list[character.mobid] = "[fakekey] was [character.real_name] ([rank])
" - GLOB.character_ckey_list[character.real_name] = character.ckey - log_character("[character.ckey] ([fakekey]) - [character.real_name] - [rank]") - - if(GLOB.respawncounts[character.ckey]) - var/AN = GLOB.respawncounts[character.ckey] - AN++ - GLOB.respawncounts[character.ckey] = AN - else - GLOB.respawncounts[character.ckey] = 1 - - log_manifest(character.mind.key, character.mind, character, latejoin = TRUE) - return character - - diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm deleted file mode 100644 index 2f61ff8cdd..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_helpers.dm +++ /dev/null @@ -1,142 +0,0 @@ -/* - Attempts to enable/disable drifter queue -*/ -/datum/controller/subsystem/role_class_handler/proc/toggle_drifter_queue() - if(drifter_queue_enabled == FALSE) // Keep in mind, if we are set to false this will soon be true, so it'd be safer to have the instructions here - if(!(length(drifter_wave_schedule) > current_wave_number + drifter_wave_schedule_buffer)) - handle_drifter_wave_scheduling() - if(world.time > next_drifter_mass_release_time) - next_drifter_mass_release_time = world.time + 5 MINUTES - - drifter_queue_enabled = !drifter_queue_enabled - can_fire = drifter_queue_enabled - -/* - Attempts to just toggle whether the drifter queue is delayed or not -*/ -/datum/controller/subsystem/role_class_handler/proc/delay_drifter_queue() - drifter_queue_delayed = !drifter_queue_delayed - rebuild_drifter_time_string() - -/* - Attempts to remove and cleanup drifter queue viewer datum - -*/ -/datum/controller/subsystem/role_class_handler/proc/remove_drifter_queue_viewer(client/C) - var/datum/drifter_queue_menu/menu = drifter_queue_menus[C.ckey] - if(menu) - if(menu.linked_client) - menu.ForceCloseMenus() - menu.linked_client = null - drifter_queue_menus.Remove(C.ckey) - qdel(menu) - -/* - Attempts to create a new drifter queue viewer datum and tie the client into it -*/ -/datum/controller/subsystem/role_class_handler/proc/add_drifter_queue_viewer(client/C) - if(!drifter_queue_enabled) - return - - var/datum/drifter_queue_menu/menu = drifter_queue_menus[C.ckey] - if(menu) - if(!menu.linked_client) - menu.linked_client = C - menu.first_show_drifter_queue_menu() - else - menu = new() - drifter_queue_menus[C.ckey] = menu - menu.linked_client = C - menu.first_show_drifter_queue_menu() - -/* - Attempts to add a client to be queued for processing in the next drifter release -*/ -/datum/controller/subsystem/role_class_handler/proc/attempt_to_add_client_to_drifter_queue(client/target_client) - if(target_client in drifter_queue_joined_clients) - return FALSE -// var/datum/drifter_wave/current_wave = drifter_wave_schedule[current_wave_number] - //if(drifter_wave_joined_clients.len >= current_wave.maximum_playercount) - // return FALSE - if(!check_drifterwave_restrictions(target_client)) - return FALSE - if(Master.current_runlevel < RUNLEVEL_LOBBY) // No entering during init - return FALSE - if(Master.current_runlevel == RUNLEVEL_LOBBY) - var/mob/dead/new_player/pregame_tard = target_client.mob - if(pregame_tard.ready == PLAYER_READY_TO_PLAY) // No entering if you are already ready - return FALSE - - drifter_queue_joined_clients += target_client - // If the current wave isn't full jus enter us in brother - if(current_wave.maximum_playercount > drifter_wave_FULLY_entered_clients.len) - drifter_wave_FULLY_entered_clients += target_client - rebuild_drifter_html_table() - queue_table_browser_update = TRUE - return TRUE - - -/* - Attempts to remove a client from the processing list for the next drifter release -*/ -/datum/controller/subsystem/role_class_handler/proc/remove_client_from_drifter_queue(client/target_client) - if(target_client in drifter_queue_joined_clients) - drifter_queue_joined_clients -= target_client - if(target_client in drifter_wave_FULLY_entered_clients) - drifter_wave_FULLY_entered_clients -= target_client - rebuild_drifter_html_table() - queue_table_browser_update = TRUE - return TRUE - return FALSE - -/* - A haphazard proc that just attempts to cleanup anything related to a client in both the queue and viewer areas -*/ -/datum/controller/subsystem/role_class_handler/proc/cleanup_drifter_queue(client/target_client) - remove_client_from_drifter_queue(target_client) - remove_drifter_queue_viewer(target_client) - -/* - Just checks the restrictions on the drifter wave datum against the client and tells you if they ain't getting in - If I build a total string and do every check then... it may get a bit nasty you know? -*/ -/datum/controller/subsystem/role_class_handler/proc/check_drifterwave_restrictions(client/target_client) - if(length(current_wave.allowed_races) && !(target_client.prefs.pref_species.name in current_wave.allowed_races)) - to_chat(target_client, " WRONG RACE ") - return FALSE - if(length(current_wave.allowed_patrons) && !(target_client.prefs.selected_patron.type in current_wave.allowed_patrons)) - to_chat(target_client, " WRONG PATRON ") - return FALSE - - var/list/local_allowed_sexes = list() - if(length(current_wave.allowed_sexes)) - local_allowed_sexes |= current_wave.allowed_sexes - if(length(local_allowed_sexes) && !(target_client.prefs.gender in local_allowed_sexes)) - return JOB_UNAVAILABLE_SEX - if(length(current_wave.allowed_sexes) && !(target_client.prefs.gender in current_wave.allowed_sexes)) - to_chat(target_client, " WRONG GENDER ") - return FALSE - if(length(current_wave.allowed_ages) && !(target_client.prefs.age in current_wave.allowed_ages)) - to_chat(target_client, " WRONG AGEGROUP ") - return FALSE - if(length(current_wave.allowed_skintones) && !(target_client.prefs.skin_tone in current_wave.allowed_skintones)) - to_chat(target_client, " WRONG ANCESTRY ") - return FALSE - return TRUE - -/* - Just a proc that occurs a smidge before the MC gets its runlevel set to RUNLEVEL_GAME -*/ -/datum/controller/subsystem/role_class_handler/proc/RoundStart() - drifter_queue_delayed = FALSE - //rebuild_drifter_time_string() - - //for(var/cur_ckey in drifter_queue_menus) - // var/datum/drifter_queue_menu/cur_menu = drifter_queue_menus[cur_ckey] - // if(!cur_menu.linked_client) - // drifter_queue_menus.Remove(cur_ckey) - // qdel(cur_menu) - // continue - - // cur_menu.show_drifter_queue_menu() - diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_scheduling.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_scheduling.dm deleted file mode 100644 index d8062a6a98..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_queue_scheduling.dm +++ /dev/null @@ -1,60 +0,0 @@ -/* - Schedule next drifter queue wave - To note here where relevant logic would be - For now its gonna be slopped -*/ -/datum/controller/subsystem/role_class_handler -/* - List of drifter wave datums, created and crammed up this lists ass in the initialize for this subsystem - ex: sorted_drifter_wave_categories[CTAG_ANTAG] += /datum/drifter_wave/turbo_killa - contents: sorted_drifter_wave_categories = list(CTAG_ANTAG = list(/datum/drifter_wave/antag1), CTAG_RETARDS = list(/datum/drifter_wave/retardz2) ... etc) - snowflake lists: CTAG_ALLWAVES - Every wave, CTAG_DISABLED - Its supposed to be disabled -*/ - var/list/sorted_drifter_wave_categories = list() - -/* - WORKING VARS -*/ -// Gets set on the mode if bandits are in the round - var/bandits_in_round = FALSE - -/* - THE RETARDED PROC FOR TRYING TO SCHEDULE ANOTHER WAVE -*/ -/datum/controller/subsystem/role_class_handler/proc/handle_drifter_wave_scheduling() - - var/target_wave_addition = drifter_wave_schedule_buffer - (drifter_wave_schedule.len - current_wave_number) - if(target_wave_addition <= 0) // target wave additions will enter negatives if we are way past buffer too - return - - // Filler code for any complex logic rn - for(var/i in 1 to target_wave_addition) - var/datum/drifter_wave/BIGMAN - - /* if(bandits_in_round && prob(35)) - BIGMAN = pick(sorted_drifter_wave_categories[DTAG_BANDITS]) - else */ - BIGMAN = pick(sorted_drifter_wave_categories[DTAG_FILLERS]) - var/datum/drifter_wave/LITTLEMAN = new BIGMAN.type - drifter_wave_schedule += LITTLEMAN - - - - // Run post run for old wave - if(current_wave) - current_wave.post_drifter_wave() - // Set a new wave - current_wave = drifter_wave_schedule[current_wave_number] - // Run setup for new wave - current_wave.pre_drifter_wave() - - //See if theres anyone already in queue for us to pick, If so they get auto joined into the next wave - if(drifter_queue_joined_clients.len) - var/end_num = current_wave.maximum_playercount - if(end_num > drifter_queue_joined_clients.len) - end_num = drifter_queue_joined_clients.len - for(var/i in 1 to end_num) - var/client/q_client = drifter_queue_joined_clients[i] - drifter_wave_FULLY_entered_clients += q_client - rebuild_drifter_html_table() - queue_table_browser_update = TRUE diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/_drifter_wave.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/_drifter_wave.dm deleted file mode 100644 index 27c15f4c9c..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/_drifter_wave.dm +++ /dev/null @@ -1,99 +0,0 @@ -/* - Data object dedicated to holding the relevant data for a drifter wave -*/ -/datum/drifter_wave - // Name of the wave to be shown where relevant - var/wave_type_name = "ERROR" - // Maximum playercount of wave - var/maximum_playercount = 12 - // Tooltip when mousing over a wave type name in the menu - var/wave_type_tooltip = "ERROR: If you see this one report it" - // Title of the job related to the job subsystem thats being made/equipped towards for the wave - var/job_rank = "Drifter" - // Categories this drifter wave is in - var/list/drifter_wave_categories = list(DTAG_DISABLED) - // If you stick something in here, we will not use the job equip related to the job rank and instead force this specific outfit onto them - var/datum/outfit/bypass_job_and_force_this_outfit_on - // Delay before we fire when its our turn to be current wave - var/wave_delay_time = 2 MINUTES - - //Restrictions on what is required in order to enter the wave - //Make sure to set this up if you need it otherwise you might cuck someone if theres a class selection w requirements. - var/list/allowed_sexes - // This wave does not allow a swap of gender based on species variables - var/immune_to_genderswap = FALSE - - var/list/allowed_races - var/list/allowed_patrons - var/list/allowed_ages = ALL_AGES_LIST - var/list/allowed_skintones - - - -/* - How many of each class category type we will attempt to roll - EX: advclass_cat_rolls = list(CTAG_PILGRIM = 5, CTAG_ADVENTURER = 5) -*/ - var/list/advclass_cat_rolls - // Whether we bypass the requirements on the advclasses or not - var/class_cat_alloc_bypass_reqs = FALSE - -/* - If we are going to plusboost classes - EX: class_cat_plusboost_attempts = list(CTAG_PILGRIM = 2) - 2 plusboosts to pilgrim category -*/ - var/list/class_cat_plusboost_attempts - -/* - If you are going to force specific datums into their selector - EX: forced_class_additions = list(/datum/advclass/cockballs) - be forewarned this is a list of types not refs -*/ - var/list/forced_class_additions - // If we are going to bypass the requirements on forced class additions - var/forced_class_bypass_reqs = TRUE - -/* - How many times we are going to plusboost the forced classes - EX: forced_class_plusboost = 2 -*/ - var/forced_class_plusboost - -/* - List of atoms that shall be the place we will dump our guys in at - I will opt to not initialize this list right here - for the reasons of people should build their landing spots - and pre-existing slop might not want us to place the guy anywhere -*/ - var/list/drifter_dropzone_targets - -/* - Proc to build a dropzone for us to be at -*/ -/datum/drifter_wave/proc/build_dropzone() - return FALSE - - -/* - Pre drifter wave run proc - Runs right after its set to be the current wave -*/ -/datum/drifter_wave/proc/pre_drifter_wave() - var/datum/job/target_job = SSjob.GetJob(job_rank) - target_job.drifter_wave_attachment = src - -/* - Occurs after character creation - specifically right after they are forced to the dropzone -*/ -/datum/drifter_wave/proc/post_character_handling() - return FALSE - -/* - Post drifter wave run proc - Runs right before next current wave is set, aka we've reached the normal end of life -*/ -/datum/drifter_wave/proc/post_drifter_wave() - var/datum/job/target_job = SSjob.GetJob(job_rank) - target_job.drifter_wave_attachment = null diff --git a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/drifter_wave.dm b/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/drifter_wave.dm deleted file mode 100644 index c4524b68ee..0000000000 --- a/code/controllers/subsystem/rogue/role_class_handler/drifter_queue/drifter_waves/drifter_wave.dm +++ /dev/null @@ -1,37 +0,0 @@ -/datum/drifter_wave/drifters - // Name of the wave to be shown where relevant - wave_type_name = "Adventurers" - // Maximum playercount of wave - maximum_playercount = 6 - // Tooltip when moused over on wave - wave_type_tooltip = "A band of immigrants searching for fame and fortune." - // Title of the job related to the job subsystem thats being made/equipped towards for the wave - job_rank = "Drifter" - drifter_wave_categories = list(DTAG_FILLERS) - advclass_cat_rolls = list(CTAG_PILGRIM = 26, CTAG_ADVENTURER = 22) - class_cat_plusboost_attempts = list(CTAG_PILGRIM = 3) // Here you go buddy, have a 3 on pilgrims - - wave_delay_time = 2 MINUTES - - // BUILD THE LIST! - drifter_dropzone_targets = list() - -/datum/drifter_wave/drifters/build_dropzone() - // This will be full of turfs - var/list/potential_target_dropzones = list() - - for(var/obj/effect/landmark/cur_landmark in GLOB.landmarks_list) - if(istype(cur_landmark, /obj/effect/landmark/start/adventurerlate)) - potential_target_dropzones += cur_landmark - - if(!potential_target_dropzones.len) - if(SSjob.latejoin_trackers.len) - potential_target_dropzones += pick(SSjob.latejoin_trackers) - - var/atom/TITS = pick(potential_target_dropzones) // Well we got our thing - - // we try our best to deploy each guy into his own turf ok this def needs to be less retarded but the map landmarks can be retarded - var/rows_2_make = ceil(maximum_playercount/2) - for(var/turf/T in block(TITS.x-1, TITS.y-2, TITS.z, TITS.x+rows_2_make, TITS.y+1, TITS.z)) - if(isopenturf(T)) - drifter_dropzone_targets += T diff --git a/code/controllers/subsystem/rogue/role_class_handler/role_class_handler.dm b/code/controllers/subsystem/rogue/role_class_handler/role_class_handler.dm index 897c829e7f..1a7f81bb0e 100644 --- a/code/controllers/subsystem/rogue/role_class_handler/role_class_handler.dm +++ b/code/controllers/subsystem/rogue/role_class_handler/role_class_handler.dm @@ -11,6 +11,7 @@ SUBSYSTEM_DEF(role_class_handler) init_order = INIT_ORDER_ROLE_CLASS_HANDLER priority = FIRE_PRIORITY_ROLE_CLASS_HANDLER runlevels = RUNLEVEL_LOBBY|RUNLEVEL_GAME|RUNLEVEL_SETUP + flags = SS_NO_FIRE /* a list of datums dedicated to helping handle a class selection session @@ -37,16 +38,15 @@ SUBSYSTEM_DEF(role_class_handler) var/list/sorted_class_categories = list() + /// Whether bandits have been injected in the game + var/bandits_in_round = FALSE + /* We init and build the retard azz listszz */ /datum/controller/subsystem/role_class_handler/Initialize() build_dumbass_category_lists() - rebuild_drifter_time_string() - if(drifter_queue_enabled) - handle_drifter_wave_scheduling() - initialized = TRUE return ..() @@ -54,17 +54,6 @@ SUBSYSTEM_DEF(role_class_handler) // This covers both class datums and drifter waves /datum/controller/subsystem/role_class_handler/proc/build_dumbass_category_lists() - var/list/all_drifter_waves = list() - init_subtypes(/datum/drifter_wave, all_drifter_waves) // Init all the drifter waves - sorted_drifter_wave_categories[DTAG_ALLWAVES] = all_drifter_waves - - for(var/datum/drifter_wave/stupidass_datum in all_drifter_waves) - for(var/dtag in stupidass_datum.drifter_wave_categories) - if(!sorted_drifter_wave_categories[dtag]) - sorted_drifter_wave_categories[dtag] = list() - sorted_drifter_wave_categories[dtag] += stupidass_datum - - var/list/all_classes = list() init_subtypes(/datum/advclass, all_classes) // Init all the classes sorted_class_categories[CTAG_ALLCLASS] = all_classes @@ -82,7 +71,7 @@ SUBSYSTEM_DEF(role_class_handler) We setup the class handler here, aka the menu We will cache it per server session via an assc list with a ckey leading to the datum. */ -/datum/controller/subsystem/role_class_handler/proc/setup_class_handler(mob/living/carbon/human/H) +/datum/controller/subsystem/role_class_handler/proc/setup_class_handler(mob/living/carbon/human/H, advclass_rolls_override = null) // insure they somehow aren't closing the datum they got and opening a new one w rolls var/datum/class_select_handler/GOT_IT = class_select_handlers[H.client.ckey] if(GOT_IT) @@ -94,20 +83,18 @@ SUBSYSTEM_DEF(role_class_handler) var/datum/class_select_handler/XTRA_MEATY = new() XTRA_MEATY.linked_client = H.client - var/datum/job/roguetown/RT_JOB = SSjob.GetJob(H.job) - if(RT_JOB.drifter_wave_attachment) // We got a drifter wave attachment, time to setup a different and specific set of information, yaaay two job systems - var/datum/drifter_wave/dwave = RT_JOB.drifter_wave_attachment - XTRA_MEATY.class_cat_alloc_attempts = dwave.advclass_cat_rolls - XTRA_MEATY.class_cat_alloc_bypass_reqs = dwave.class_cat_alloc_bypass_reqs - XTRA_MEATY.class_cat_plusboost_attempts = dwave.class_cat_plusboost_attempts - - XTRA_MEATY.forced_class_additions = dwave.forced_class_additions - XTRA_MEATY.forced_class_bypass_reqs = dwave.forced_class_bypass_reqs - XTRA_MEATY.forced_class_plusboost = dwave.forced_class_plusboost + // Hack for Migrants + if(advclass_rolls_override) + XTRA_MEATY.class_cat_alloc_attempts = advclass_rolls_override + //XTRA_MEATY.PQ_boost_divider = 10 else + var/datum/job/roguetown/RT_JOB = SSjob.GetJob(H.job) if(RT_JOB.advclass_cat_rolls.len) XTRA_MEATY.class_cat_alloc_attempts = RT_JOB.advclass_cat_rolls + //if(RT_JOB.PQ_boost_divider) + //XTRA_MEATY.PQ_boost_divider = RT_JOB.PQ_boost_divider + if(H.client.ckey in special_session_queue) XTRA_MEATY.special_session_queue = list() for(var/funny_key in special_session_queue[H.client.ckey]) diff --git a/code/controllers/subsystem/ticker.dm b/code/controllers/subsystem/ticker.dm index 82f24d4a46..20731b878b 100644 --- a/code/controllers/subsystem/ticker.dm +++ b/code/controllers/subsystem/ticker.dm @@ -447,7 +447,6 @@ SUBSYSTEM_DEF(ticker) log_game("GAME SETUP: round start events success") LAZYCLEARLIST(round_start_events) - SSrole_class_handler.RoundStart() CHECK_TICK if(isrogueworld) for(var/obj/structure/fluff/traveltile/TT in GLOB.traveltiles) diff --git a/code/datums/migrants/migrant_assignment.dm b/code/datums/migrants/migrant_assignment.dm new file mode 100644 index 0000000000..19ff2d9cde --- /dev/null +++ b/code/datums/migrants/migrant_assignment.dm @@ -0,0 +1,7 @@ +/datum/migrant_assignment + var/client/client = null + var/role_type = null + var/atom/spawn_location = null +/datum/migrant_assignment/New(role) + . = ..() + role_type = role diff --git a/code/datums/migrants/migrant_job.dm b/code/datums/migrants/migrant_job.dm new file mode 100644 index 0000000000..150ac2c01b --- /dev/null +++ b/code/datums/migrants/migrant_job.dm @@ -0,0 +1,13 @@ +/datum/job/roguetown/migrant + title = "Migrant" + flag = MIGRANT + department_flag = PEASANTS + faction = "Station" + allowed_races = ALL_PLAYER_RACES_BY_NAME + outfit = null + outfit_female = null + display_order = JDO_MIGRANT + show_in_credits = FALSE + min_pq = -999 + total_positions = 0 + spawn_positions = 0 diff --git a/code/datums/migrants/migrant_pref.dm b/code/datums/migrants/migrant_pref.dm new file mode 100644 index 0000000000..d63b774a01 --- /dev/null +++ b/code/datums/migrants/migrant_pref.dm @@ -0,0 +1,68 @@ +/datum/migrant_pref + /// Reference to our prefs + var/datum/preferences/prefs + /// Whether the user wants to be a migrant + var/active = FALSE + /// Role preferences of the user, the things he clicks on to be preferred to be + var/list/role_preferences = list() +/datum/migrant_pref/New(datum/preferences/passed_prefs) + . = ..() + prefs = passed_prefs +/datum/migrant_pref/proc/set_active(new_state) + if(active == new_state) + return + active = new_state + role_preferences.Cut() +/datum/migrant_pref/proc/toggle_role_preference(role_type) + if(role_type in role_preferences) + role_preferences -= role_type + else + // Currently only allow 1 role preffed up for clarity + role_preferences.Cut() + if(SSmigrants.can_be_role(prefs.parent, role_type)) + role_preferences += role_type + else + to_chat(prefs.parent, span_warning("You can't be this role. (Wrong species, gender or age)")) +/datum/migrant_pref/proc/post_spawn() + set_active(FALSE) +/datum/migrant_pref/proc/show_ui() + var/client/client = prefs.parent + if(!client) + return + var/list/dat = list() + var/current_migrants = SSmigrants.get_active_migrant_amount() + dat += "WAVE: \Roman[SSmigrants.wave_number]" + dat += "
BE A MIGRANT: [active ? "YES" : "NO"]
" + dat += "
Wandering fools: [current_migrants ? "\Roman[current_migrants]" : "None"]
" + if(!SSmigrants.current_wave) + dat += "
The mist will clear out of the way in [(SSmigrants.time_until_next_wave / (1 SECONDS))] seconds...
" + else + var/datum/migrant_wave/wave = MIGRANT_WAVE(SSmigrants.current_wave) + dat += "
[wave.name]
" + for(var/role_type in wave.roles) + var/datum/migrant_role/role = MIGRANT_ROLE(role_type) + var/role_amount = wave.roles[role_type] + var/role_name = role.name + if(active && (role_type in role_preferences)) + role_name = "[role_name]" + var/stars_amount = SSmigrants.get_stars_on_role(role_type) + var/stars_string = "" + if(stars_amount) + stars_string = "(*\Roman[stars_amount])" + dat += "
[role_name] - \Roman[role_amount] [stars_string]
" + dat += "
They will arrive in [(SSmigrants.wave_timer / (1 SECONDS))] seconds...
" + var/datum/browser/popup = new(client.mob, "migration", "
Find a purpose
", 330, 410) + popup.set_window_options("can_close=0") + popup.set_content(dat.Join()) + popup.open(FALSE) +/datum/migrant_pref/Topic(href, href_list) + var/client/client = prefs.parent + if(!client) + return + switch(href_list["task"]) + if("toggle_active") + set_active(!active) + if("toggle_role_preference") + var/role_type = text2path(href_list["role"]) + toggle_role_preference(role_type) + show_ui() diff --git a/code/datums/migrants/migrant_role.dm b/code/datums/migrants/migrant_role.dm new file mode 100644 index 0000000000..40b324b660 --- /dev/null +++ b/code/datums/migrants/migrant_role.dm @@ -0,0 +1,32 @@ +/datum/migrant_role + abstract_type = /datum/migrant_role + /// Name of the role + var/name = "MIGRANT ROLE" + /// Restricts species if the list is not null + var/list/allowed_races + /// Restricts sexes if list is not null + var/list/allowed_sexes + /// Restricts ages if list is not null + var/list/allowed_ages + /// Typepath of outfit for the migrant role + var/outfit + /// Typepath of the antag datum for the migrant role + var/antag_datum + /// If defined they'll get adv class rolls + var/list/advclass_cat_rolls + /// Text to greet player of this role in the wave + var/greet_text + /// Whether to grant a lit torch upon spawn + var/grant_lit_torch = FALSE +/datum/migrant_role/proc/after_spawn(mob/living/carbon/human/character) + return +/datum/migrant_role/pilgrim + name = "Pilgrim" + advclass_cat_rolls = list(CTAG_PILGRIM = 10) +/datum/migrant_role/adventurer + name = "Adventurer" + advclass_cat_rolls = list(CTAG_ADVENTURER = 5) +/datum/migrant_role/bandit + name = "Bandit" + antag_datum = /datum/antagonist/bandit + grant_lit_torch = TRUE diff --git a/code/datums/migrants/migrant_wave.dm b/code/datums/migrants/migrant_wave.dm new file mode 100644 index 0000000000..3fde555ced --- /dev/null +++ b/code/datums/migrants/migrant_wave.dm @@ -0,0 +1,115 @@ +/datum/migrant_wave + abstract_type = /datum/migrant_wave + /// Name of the wave + var/name = "MIGRANT WAVE" + /// Assoc list of roles types to amount + var/list/roles = list() + /// If defined, this is the minimum active migrants required to roll the wave + var/min_active = null + /// If defined, this is the maximum active migrants required to roll the wave + var/max_active = null + /// If defined, this is the minimum population playing the game that is required for wave to roll + var/min_pop = null + /// If defined, this is the maximum population playing the game that is required for wave to roll + var/max_pop = null + /// If defined, this is the maximum amount of times this wave can spawn + var/max_spawns = null + /// The relative probability this wave will be picked, from all available waves + var/weight = 100 + /// Name of the latejoin spawn landmark for the wave to decide where to spawn + var/spawn_landmark = "Pilgrim" + /// Text to greet all players in the wave with + var/greet_text + /// Whether this wave can roll at all. If not, it can still be forced to be ran, or used as "downgrade" wave + var/can_roll = TRUE + /// What type of wave to downgrade to on failure + var/downgrade_wave + /// If defined, this will be the wave type to increment for purposes of checking `max_spawns` + var/shared_wave_type = null +/datum/migrant_wave/pilgrim + name = "Pilgrimage" + downgrade_wave = /datum/migrant_wave/pilgrim_down_one + roles = list( + /datum/migrant_role/pilgrim = 4, + ) + greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." +/datum/migrant_wave/pilgrim_down_one + name = "Pilgrimage" + downgrade_wave = /datum/migrant_wave/pilgrim_down_two + can_roll = FALSE + roles = list( + /datum/migrant_role/pilgrim = 3, + ) + greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." +/datum/migrant_wave/pilgrim_down_two + name = "Pilgrimage" + downgrade_wave = /datum/migrant_wave/pilgrim_down_three + can_roll = FALSE + roles = list( + /datum/migrant_role/pilgrim = 2, + ) + greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." +/datum/migrant_wave/pilgrim_down_three + name = "Pilgrimage" + can_roll = FALSE + roles = list( + /datum/migrant_role/pilgrim = 1, + ) + greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." +/datum/migrant_wave/adventurer + name = "Adventure Party" + downgrade_wave = /datum/migrant_wave/adventurer_down_one + roles = list( + /datum/migrant_role/adventurer = 4, + ) + greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." +/datum/migrant_wave/adventurer_down_one + name = "Adventure Party" + downgrade_wave = /datum/migrant_wave/adventurer_down_two + can_roll = FALSE + roles = list( + /datum/migrant_role/adventurer = 3, + ) + greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." +/datum/migrant_wave/adventurer_down_two + name = "Adventure Party" + downgrade_wave = /datum/migrant_wave/adventurer_down_three + can_roll = FALSE + roles = list( + /datum/migrant_role/adventurer = 2, + ) + greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." +/datum/migrant_wave/adventurer_down_three + name = "Adventure Party" + can_roll = FALSE + roles = list( + /datum/migrant_role/adventurer = 1, + ) + greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." +/datum/migrant_wave/bandit + name = "Bandit Raid" + downgrade_wave = /datum/migrant_wave/bandit_down_one + weight = 5 + roles = list( + /datum/migrant_role/bandit = 4, + ) +/datum/migrant_wave/bandit_down_one + name = "Bandit Raid" + downgrade_wave = /datum/migrant_wave/bandit_down_two + can_roll = FALSE + roles = list( + /datum/migrant_role/bandit = 3, + ) +/datum/migrant_wave/bandit_down_two + name = "Bandit Raid" + downgrade_wave = /datum/migrant_wave/bandit_down_three + can_roll = FALSE + roles = list( + /datum/migrant_role/bandit = 2, + ) +/datum/migrant_wave/bandit_down_three + name = "Bandit Raid" + can_roll = FALSE + roles = list( + /datum/migrant_role/bandit = 1, + ) diff --git a/code/datums/migrants/waves/heartfell_wave.dm b/code/datums/migrants/waves/heartfell_wave.dm new file mode 100644 index 0000000000..2bdb73303c --- /dev/null +++ b/code/datums/migrants/waves/heartfell_wave.dm @@ -0,0 +1,314 @@ +/datum/migrant_role/heartfelt/lord + name = "Lord of Heartfelt" + greet_text = "You are the Lord of Heartfelt, ruler of a once-prosperous barony now in ruin. Guided by your Magos, you journey to Rockhill, seeking aid to restore your domain to its former glory, or perhaps claim a new throne." + outfit = /datum/outfit/job/roguetown/heartfelt/lord + allowed_sexes = list(MALE) + allowed_races = list("Humen") + grant_lit_torch = TRUE +/datum/outfit/job/roguetown/heartfelt/lord/pre_equip(mob/living/carbon/human/H) + ..() + shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt + belt = /obj/item/storage/belt/rogue/leather/black + neck = /obj/item/clothing/neck/roguetown/gorget + head = /obj/item/clothing/head/roguetown/helmet + shoes = /obj/item/clothing/shoes/roguetown/nobleboot + pants = /obj/item/clothing/under/roguetown/tights/black + cloak = /obj/item/clothing/cloak/heartfelt + armor = /obj/item/clothing/suit/roguetown/armor/medium/surcoat/heartfelt + beltr = /obj/item/storage/belt/rogue/pouch/coins/rich + beltl = /obj/item/scomstone + gloves = /obj/item/clothing/gloves/roguetown/leather/black + neck = /obj/item/clothing/neck/roguetown/chaincoif + beltl = /obj/item/rogueweapon/sword/long + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.change_stat("strength", 1) + H.change_stat("intelligence", 3) + H.change_stat("endurance", 3) + H.change_stat("speed", 1) + H.change_stat("perception", 2) + H.change_stat("fortune", 5) + ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_NOSEGRAB, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) +/datum/migrant_role/heartfelt/lady + name = "Lady of Heartfelt" + greet_text = "You are the Lady of Heartfelt, once a respected noblewoman now struggling to survive in a desolate landscape. With your home in ruins, you look to Rockhill, hoping to find new purpose or refuge amidst the chaos." + outfit = /datum/outfit/job/roguetown/heartfelt/lady + allowed_sexes = list(FEMALE) + allowed_races = list("Humen") + grant_lit_torch = TRUE +/datum/outfit/job/roguetown/heartfelt/lady/pre_equip(mob/living/carbon/human/H) + ..() + head = /obj/item/clothing/head/roguetown/hennin + neck = /obj/item/storage/belt/rogue/pouch/coins/rich + cloak = /obj/item/clothing/cloak/heartfelt + if(isdwarf(H)) + armor = /obj/item/clothing/suit/roguetown/shirt/dress + else + if(prob(66)) + armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress/alt + else + armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress + beltl = /obj/item/flashlight/flare/torch/lantern + beltr = /obj/item/storage/belt/rogue/pouch + id = /obj/item/clothing/ring/silver + shoes = /obj/item/clothing/shoes/roguetown/shortboots + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.change_stat("intelligence", 3) + H.change_stat("endurance", 3) + H.change_stat("speed", 2) + H.change_stat("perception", 2) + H.change_stat("fortune", 5) + ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_NUTCRACKER, TRAIT_GENERIC) +/datum/migrant_role/heartfelt/hand + name = "Hand of Heartfelt" + greet_text = "You are the Hand of Heartfelt, burdened by the perception of failure in protecting your Lord's domain. Despite doubts from others, your loyalty remains steadfast as you journey to Rockhill, determined to fulfill your duties." + outfit = /datum/outfit/job/roguetown/heartfelt/hand + allowed_races = list("Humen") + grant_lit_torch = TRUE +/datum/outfit/job/roguetown/heartfelt/hand/pre_equip(mob/living/carbon/human/H) + ..() + shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt + belt = /obj/item/storage/belt/rogue/leather/black + shoes = /obj/item/clothing/shoes/roguetown/nobleboot + pants = /obj/item/clothing/under/roguetown/tights/black + neck = /obj/item/clothing/neck/roguetown/gorget + armor = /obj/item/clothing/suit/roguetown/armor/medium/surcoat/heartfelt + beltr = /obj/item/storage/belt/rogue/pouch/coins/rich + gloves = /obj/item/clothing/gloves/roguetown/leather/black + beltl = /obj/item/rogueweapon/sword/decorated + beltr = /obj/item/scomstone + backr = /obj/item/storage/backpack/rogue/satchel/heartfelt + mask = /obj/item/clothing/mask/rogue/spectacles/golden + neck = /obj/item/clothing/neck/roguetown/chaincoif + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.change_stat("strength", 3) + H.change_stat("perception", 2) + H.change_stat("intelligence", 3) + + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) +/datum/migrant_role/heartfelt/knight + name = "Knight of Heartfelt" + greet_text = "You are a Knight of Heartfelt, once part of a brotherhood in service to your Lord. Now, alone and committed to safeguarding what remains of your court, you ride to Rockhill, resolved to ensure their safe arrival." + outfit = /datum/outfit/job/roguetown/heartfelt/knight + allowed_races = list("Humen") + grant_lit_torch = TRUE +/datum/outfit/job/roguetown/heartfelt/knight/pre_equip(mob/living/carbon/human/H) + ..() + head = /obj/item/clothing/head/helmet/knight + gloves = /obj/item/clothing/gloves/roguetown/plate + pants = /obj/item/clothing/under/roguetown/platelegs + cloak = /obj/item/clothing/cloak/tabard/knight/guard + neck = /obj/item/clothing/neck/roguetown/bevor + shirt = /obj/item/clothing/suit/roguetown/armor/chainmail + armor = /obj/item/clothing/suit/roguetown/armor/plate/full + shoes = /obj/item/clothing/shoes/roguetown/boots/armor + beltr = /obj/item/rogueweapon/sword/long + beltl = /obj/item/flashlight/flare/torch/lantern + belt = /obj/item/storage/belt/rogue/leather/hand + backr = /obj/item/storage/backpack/rogue/satchel/black + if(prob(50)) + r_hand = /obj/item/rogueweapon/polearm/eaglebeak/lucerne + else + r_hand = /obj/item/rogueweapon/mace/goden/steel + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H.change_stat("strength", 3) + H.change_stat("perception", 1) + H.change_stat("intelligence", 2) + H.change_stat("constitution", 2) + H.change_stat("endurance", 2) + H.change_stat("speed", -1) + H.dna.species.soundpack_m = new /datum/voicepack/male/knight() + ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_NOSEGRAB, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) +/datum/migrant_role/heartfelt/knight/after_spawn(mob/living/L, mob/M, latejoin = TRUE) + ..() + if(ishuman(L)) + var/mob/living/carbon/human/H = L + if(istype(H.cloak, /obj/item/clothing/cloak/tabard/knight/guard)) + var/obj/item/clothing/S = H.cloak + var/index = findtext(H.real_name, " ") + if(index) + index = copytext(H.real_name, 1,index) + if(!index) + index = H.real_name + S.name = "knight tabard ([index])" + var/prev_real_name = H.real_name + var/prev_name = H.name + var/honorary = "Sir" + if(H.gender == FEMALE) + honorary = "Dame" + H.real_name = "[honorary] [prev_real_name]" + H.name = "[honorary] [prev_name]" +/datum/migrant_role/heartfelt/magos + name = "Magos of Heartfelt" + greet_text = "You are the Magos of Heartfelt, renowned for your arcane knowledge yet unable to foresee the tragedy that befell your home. Drawn by a guiding star to Rockhill, you seek answers and perhaps a new purpose in the wake of destruction." + outfit = /datum/outfit/job/roguetown/heartfelt/magos + allowed_races = list("Humen") + grant_lit_torch = TRUE + +/datum/outfit/job/roguetown/heartfelt/magos + allowed_patrons = list(/datum/patron/divine/noc) +/datum/outfit/job/roguetown/heartfelt/magos/pre_equip(mob/living/carbon/human/H) + ..() + neck = /obj/item/clothing/neck/roguetown/talkstone + cloak = /obj/item/clothing/cloak/black_cloak + armor = /obj/item/clothing/suit/roguetown/shirt/robe/black + pants = /obj/item/clothing/under/roguetown/tights/random + shoes = /obj/item/clothing/shoes/roguetown/shortboots + belt = /obj/item/storage/belt/rogue/leather/plaquesilver + beltl = /obj/item/flashlight/flare/torch/lantern + id = /obj/item/clothing/ring/gold + r_hand = /obj/item/rogueweapon/polearm/woodstaff + backl = /obj/item/storage/backpack/rogue/satchel + backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/poison,/obj/item/reagent_containers/glass/bottle/rogue/healthpot) + ADD_TRAIT(H, TRAIT_SEEPRICES, "[type]") + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.change_stat("strength", -1) + H.change_stat("constitution", -1) + H.change_stat("intelligence", 4) + if(H.age == AGE_OLD) + H.change_stat("speed", -1) + H.change_stat("intelligence", 1) + H.change_stat("perception", 1) + if(ishumannorthern(H)) + belt = /obj/item/storage/belt/rogue/leather/plaquegold + cloak = null + head = /obj/item/clothing/head/roguetown/wizhat + armor = /obj/item/clothing/suit/roguetown/shirt/robe/wizard + H.dna.species.soundpack_m = new /datum/voicepack/male/wizard() + var/list/spells = list(/obj/effect/proc_holder/spell/invoked/projectile/fireball/greater, /obj/effect/proc_holder/spell/invoked/projectile/fireball, /obj/effect/proc_holder/spell/invoked/projectile/lightningbolt, /obj/effect/proc_holder/spell/invoked/projectile/fetch) + for(var/S in spells) + H.mind.AddSpell(new S) +/datum/migrant_role/heartfelt/prior + name = "Prior of Heartfelt" + greet_text = "The Prior of Heartfelt, you were destined for ascension within the Church, but fate intervened with the barony's downfall, delaying it indefinitely. Still guided by the blessings of Astrata, you journey to Rockhill, determined to offer what aid and solace you can." + outfit = /datum/outfit/job/roguetown/heartfelt/prior + allowed_races = list("Humen") + grant_lit_torch = TRUE +/datum/outfit/job/roguetown/heartfelt/prior + allowed_patrons = list(/datum/patron/divine/astrata) +/datum/outfit/job/roguetown/heartfelt/prior/pre_equip(mob/living/carbon/human/H) + ..() + H.virginity = TRUE + neck = /obj/item/clothing/neck/roguetown/psycross/silver + shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/priest + pants = /obj/item/clothing/under/roguetown/tights/black + shoes = /obj/item/clothing/shoes/roguetown/shortboots + belt = /obj/item/storage/belt/rogue/leather/rope + beltl = /obj/item/flashlight/flare/torch/lantern + beltr = /obj/item/storage/belt/rogue/pouch/coins/rich + armor = /obj/item/clothing/suit/roguetown/shirt/robe/priest + cloak = /obj/item/clothing/cloak/chasuble + backl = /obj/item/storage/backpack/rogue/satchel + backpack_contents = list( + /obj/item/needle/blessed = 1, + ) + if(H.mind) + H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind.adjust_skillrank(/datum/skill/misc/medicine, 4, TRUE) + H.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) + if(H.age == AGE_OLD) + H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.change_stat("strength", -1) + H.change_stat("intelligence", 3) + H.change_stat("constitution", -1) + H.change_stat("endurance", 1) + H.change_stat("speed", -1) + var/datum/devotion/cleric_holder/C = new /datum/devotion/cleric_holder(H, H.patron) + C.grant_spells_priest(H) + H.verbs += list(/mob/living/carbon/human/proc/devotionreport, /mob/living/carbon/human/proc/clericpray) + +/datum/migrant_wave/heartfelt + name = "The Court of Heartfelt" + max_spawns = 1 + shared_wave_type = /datum/migrant_wave/heartfelt + weight = 50 + downgrade_wave = /datum/migrant_wave/heartfelt_down + roles = list( + /datum/migrant_role/heartfelt/lord = 1, + /datum/migrant_role/heartfelt/lady = 1, + /datum/migrant_role/heartfelt/hand = 1, + /datum/migrant_role/heartfelt/knight = 1, + /datum/migrant_role/heartfelt/magos = 1, + /datum/migrant_role/heartfelt/prior = 1, + ) + greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. Stay close and watch out for each other, for all of your sakes!" +/datum/migrant_wave/heartfelt_down + name = "The Court of Heartfelt" + shared_wave_type = /datum/migrant_wave/heartfelt + can_roll = FALSE + roles = list( + /datum/migrant_role/heartfelt/lord = 1, + /datum/migrant_role/heartfelt/lady = 1, + /datum/migrant_role/heartfelt/hand = 1, + ) + greet_text = "Fleeing disaster, you have come together as a court, united in a final effort to restore the former glory and promise of Heartfelt. Stay close and watch out for each other, for all of your sakes! Your Knight, Magos and Prior died on the way here..." diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 3551b7c5c9..58f5b77cd8 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -380,16 +380,13 @@ // if(player.client && player.client.whitelisted() && !player.client.blacklisted()) players += player continue - if(player.client in SSrole_class_handler.drifter_wave_FULLY_entered_clients) - players += player - continue // Shuffling, the players list is now ping-independent!!! // Goodbye antag dante players = shuffle(players) for(var/mob/dead/new_player/player in players) - if(player.client && player.ready == PLAYER_READY_TO_PLAY || (player.client in SSrole_class_handler.drifter_wave_FULLY_entered_clients)) + if(player.client && player.ready == PLAYER_READY_TO_PLAY) if(check_pq) if(get_playerquality(player.ckey) <= -10) continue diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm index 7dcd370e21..582c6d784d 100644 --- a/code/modules/admin/admin_verbs.dm +++ b/code/modules/admin/admin_verbs.dm @@ -24,6 +24,7 @@ GLOBAL_PROTECT(admin_verbs_default) /client/proc/returntolobby, /datum/verbs/menu/Admin/verb/playerpanel, /client/proc/check_antagonists, + /client/proc/admin_force_next_migrant_wave, /client/proc/cmd_admin_say, /client/proc/deadmin, /*destroys our own admin datum so we can play as a regular player*/ /client/proc/set_context_menu_enabled, diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 5e04542ce4..7c2e9ec3ee 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -129,6 +129,8 @@ GLOBAL_LIST_EMPTY(chosen_names) var/list/exp = list() var/list/menuoptions + var/datum/migrant_pref/migrant + var/action_buttons_screen_locs = list() var/domhand = 2 @@ -152,6 +154,8 @@ GLOBAL_LIST_EMPTY(chosen_names) /datum/preferences/New(client/C) parent = C + migrant = new /datum/migrant_pref(src) + for(var/custom_name_id in GLOB.preferences_custom_names) custom_names[custom_name_id] = get_default_name(custom_name_id) @@ -245,9 +249,7 @@ GLOBAL_LIST_EMPTY(chosen_names) dat += "" dat += "" - if(SSrole_class_handler.drifter_queue_enabled) - dat += "" - dat += "Adventurer Queue" + dat += "" dat += "" @@ -932,7 +934,11 @@ GLOBAL_LIST_EMPTY(chosen_names) dat += "UNREADY READY" log_game("([user || "NO KEY"]) readied as ([real_name])") else - dat += "JOINLATE" + if(!is_active_migrant()) + dat += "JOINLATE" + else + dat += "JOINLATE" + dat += " - MIGRATION" // dat += "Reset Setup" dat += "" @@ -1544,11 +1550,6 @@ Slots: [job.spawn_positions] else if(href_list["preference"] == "triumphs") user.show_triumphs_list() - else if(href_list["preference"] == "drifters") - switch(href_list["task"]) - if("show_drifter_queue") - SSrole_class_handler.add_drifter_queue_viewer(user.client) - else if(href_list["preference"] == "playerquality") check_pq_menu(user.ckey) @@ -2410,6 +2411,10 @@ Slots: [job.spawn_positions] else to_chat(user, span_warning("You are no longer a voice.")) + if("migrants") + migrant.show_ui() + return + if("save") save_preferences() save_character() @@ -2593,3 +2598,10 @@ Slots: [job.spawn_positions] return else custom_names[name_id] = sanitized_name + +/datum/preferences/proc/is_active_migrant() + if(!migrant) + return FALSE + if(!migrant.active) + return FALSE + return TRUE diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 50789c7124..1c09267f57 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -119,12 +119,6 @@ You will still need to contact the subsystem though */ var/list/advclass_cat_rolls -/* - Basically this is just a ref to a drifter wave if its attached to one - The role class handler will grab relevant data out of it it uses a class select - Just make sure to unattach afterward we are done. -*/ - var/datum/drifter_wave/drifter_wave_attachment /datum/job/proc/special_job_check(mob/dead/new_player/player) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm b/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm deleted file mode 100644 index dd24601373..0000000000 --- a/code/modules/jobs/job_types/roguetown/adventurer/DRIFTERZ.dm +++ /dev/null @@ -1,41 +0,0 @@ - -/* - Once again we are back here, ha hahaha.... - Also this is basically just a shell for the drifter queue system to manipulate. -*/ -/datum/job/roguetown/drifters - title = "Drifter" - flag = WAVE_DRIFTER - department_flag = PEASANTS - faction = "Station" - show_in_credits = FALSE - - // Everyone can be a homeless man looking for work! - allowed_races = ALL_PLAYER_RACES_BY_NAME - - tutorial = "A drifter of unknown origin searching things such as fame, fortune, and perhaps just some work to do." - - - outfit = null - outfit_female = null - - display_order = JDO_DRIFTER - show_in_credits = TRUE - min_pq = -20 - - total_positions = 0 - spawn_positions = 0 - advclass_cat_rolls = list(CTAG_PILGRIM = 2, CTAG_ADVENTURER = 2) - -/datum/job/roguetown/drifters/after_spawn(mob/living/L, mob/M, latejoin = TRUE) - ..() - if(L) - var/mob/living/carbon/human/H = L - H.advsetup = 1 - H.invisibility = INVISIBILITY_MAXIMUM - H.become_blind("advsetup") - if(!H.mind) - if(HAS_TRAIT(H, TRAIT_ASSASSIN)) // If the mob is an assassin, they will be given the assassin antag. - var/datum/antagonist/new_antag = new /datum/antagonist/assassin() - H.mind.add_antag_datum(new_antag) - diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm index 697e58eb6c..e2dde06711 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm @@ -1,5 +1,8 @@ GLOBAL_LIST_EMPTY(billagerspawns) +GLOBAL_VAR_INIT(adventurer_hugbox_duration, 40 SECONDS) +GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) + /datum/job/roguetown/adventurer title = "Adventurer" flag = ADVENTURER diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm index 63354580a2..e86268016b 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm @@ -8,7 +8,7 @@ min_pq = 2 maximum_possible_slots = 1 pickprob = 50 - category_tags = list(CTAG_ADVENTURER) + category_tags = list(CTAG_DISABLED) /datum/outfit/job/roguetown/adventurer/heartfeltlord/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm index 8978c6eb5a..cf94202a82 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm @@ -8,7 +8,7 @@ maximum_possible_slots = 1 min_pq = 1 pickprob = 50 - category_tags = list(CTAG_ADVENTURER) + category_tags = list(CTAG_DISABLED) /datum/outfit/job/roguetown/adventurer/heartfelthand/pre_equip(mob/living/carbon/human/H) ..() diff --git a/code/modules/jobs/jobs.dm b/code/modules/jobs/jobs.dm index 7e36d98e15..3e8f169e19 100644 --- a/code/modules/jobs/jobs.dm +++ b/code/modules/jobs/jobs.dm @@ -122,7 +122,6 @@ GLOBAL_LIST_INIT(peasant_positions, list( "Beggar", "Adventurer", "Pilgrim", - "Drifter" )) GLOBAL_LIST_INIT(apprentices_positions, list( diff --git a/code/modules/mob/dead/new_player/new_player.dm b/code/modules/mob/dead/new_player/new_player.dm index 0f71dfbb42..13c5535c1e 100644 --- a/code/modules/mob/dead/new_player/new_player.dm +++ b/code/modules/mob/dead/new_player/new_player.dm @@ -173,12 +173,11 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) if(href_list["refresh"]) winshow(src, "stonekeep_prefwin", FALSE) src << browse(null, "window=preferences_browser") -// src << browse(null, "window=playersetup") //closes the player setup window new_player_panel() -// if(href_list["rpprompt"]) -// do_rp_prompt() -// return + if(client && client.prefs.is_active_migrant()) + to_chat(usr, span_boldwarning("You are in the migrant queue.")) + return if(href_list["late_join"]) if(!SSticker?.IsRoundInProgress()) @@ -188,11 +187,7 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) if(href_list["late_join"] == "override") LateChoices() return -/*#ifdef MATURESERVER - if(key && (world.time < GLOB.respawntimes[key] + RESPAWNTIME)) - to_chat(usr, "I can return in [GLOB.respawntimes[key] + RESPAWNTIME - world.time].") - return -#else*/ + var/timetojoin = 5 MINUTES @@ -250,6 +245,10 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) to_chat(usr, "Server is full.") return + if(client && client.prefs.is_active_migrant()) + to_chat(usr, span_boldwarning("You are in the migrant queue.")) + return + AttemptLateSpawn(href_list["SelectedJob"]) return @@ -453,10 +452,6 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) SSticker.queued_players -= src SSticker.queue_delay = 4 - // Jus remove them from drifter queue if they were in it. - // This shit shouldn't be firing before the round starts anyways sooo this is one of the only ways in - SSrole_class_handler.cleanup_drifter_queue(client) - testing("basedtest 1") SSjob.AssignRole(src, rank, 1) @@ -697,7 +692,6 @@ GLOBAL_LIST_INIT(roleplay_readme, world.file2list("strings/rt/Lore_Primer.txt")) src << browse(null, "window=latechoices") //closes late job selection SStriumphs.remove_triumph_buy_menu(client) - SSrole_class_handler.cleanup_drifter_queue(client) winshow(src, "stonekeep_prefwin", FALSE) src << browse(null, "window=preferences_browser") diff --git a/stonekeep.dme b/stonekeep.dme index 6e79cf9cbe..935edd98a2 100644 --- a/stonekeep.dme +++ b/stonekeep.dme @@ -63,6 +63,7 @@ #include "code\__DEFINES\medical.dm" #include "code\__DEFINES\melee.dm" #include "code\__DEFINES\menu.dm" +#include "code\__DEFINES\migrants.dm" #include "code\__DEFINES\misc.dm" #include "code\__DEFINES\mob_timers.dm" #include "code\__DEFINES\mobs.dm" @@ -175,6 +176,7 @@ #include "code\_globalvars\game_modes.dm" #include "code\_globalvars\genetics.dm" #include "code\_globalvars\logging.dm" +#include "code\_globalvars\migrants.dm" #include "code\_globalvars\misc.dm" #include "code\_globalvars\plant_defs.dm" #include "code\_globalvars\regexes.dm" @@ -325,6 +327,7 @@ #include "code\controllers\subsystem\rogue\damoverlays.dm" #include "code\controllers\subsystem\rogue\devotion.dm" #include "code\controllers\subsystem\rogue\humannpc.dm" +#include "code\controllers\subsystem\rogue\migration.dm" #include "code\controllers\subsystem\rogue\pollutants.dm" #include "code\controllers\subsystem\rogue\roguemachine.dm" #include "code\controllers\subsystem\rogue\roguerot.dm" @@ -334,13 +337,6 @@ #include "code\controllers\subsystem\rogue\water_level.dm" #include "code\controllers\subsystem\rogue\role_class_handler\role_class_handler.dm" #include "code\controllers\subsystem\rogue\role_class_handler\class_select_handler\class_select_handler.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_queue.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_queue_helpers.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_queue_scheduling.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_menu\drifter_queue_menu.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_menu\drifter_queue_menu_build.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_waves\_drifter_wave.dm" -#include "code\controllers\subsystem\rogue\role_class_handler\drifter_queue\drifter_waves\drifter_wave.dm" #include "code\controllers\subsystem\rogue\triumphs\triumph_adjust_procs.dm" #include "code\controllers\subsystem\rogue\triumphs\triumph_buy_menu.dm" #include "code\controllers\subsystem\rogue\triumphs\triumphs.dm" @@ -532,6 +528,12 @@ #include "code\datums\martial\wrestling.dm" #include "code\datums\materials\_material.dm" #include "code\datums\materials\basemats.dm" +#include "code\datums\migrants\migrant_assignment.dm" +#include "code\datums\migrants\migrant_job.dm" +#include "code\datums\migrants\migrant_pref.dm" +#include "code\datums\migrants\migrant_role.dm" +#include "code\datums\migrants\migrant_wave.dm" +#include "code\datums\migrants\waves\heartfell_wave.dm" #include "code\datums\mob_descriptors\mob_descriptor.dm" #include "code\datums\mob_descriptors\descriptors\body.dm" #include "code\datums\mob_descriptors\descriptors\face.dm" @@ -1349,7 +1351,6 @@ #include "code\modules\jobs\job_types\roguetown\roguetown.dm" #include "code\modules\jobs\job_types\roguetown\statueitems.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\adventurer.dm" -#include "code\modules\jobs\job_types\roguetown\adventurer\DRIFTERZ.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\pilgrim.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\villager.dm" #include "code\modules\jobs\job_types\roguetown\adventurer\types\_advclass.dm" From dfcd90460e2bc9dc1441226ca05a768ed2926e3a Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:39:33 -0800 Subject: [PATCH 2/9] tweaks --- code/controllers/subsystem/rogue/migration.dm | 115 +++++++++++++----- code/datums/migrants/migrant_pref.dm | 48 +++++++- code/datums/migrants/migrant_role.dm | 7 ++ code/datums/migrants/migrant_wave.dm | 22 +++- code/datums/mind.dm | 7 +- code/modules/jobs/job_types/_job.dm | 1 + .../roguetown/adventurer/adventurer.dm | 2 + .../mob/living/carbon/human/examine.dm | 28 +++-- code/modules/mob/mob_defines.dm | 1 + code/modules/mob/mob_helpers.dm | 14 +++ 10 files changed, 196 insertions(+), 49 deletions(-) diff --git a/code/controllers/subsystem/rogue/migration.dm b/code/controllers/subsystem/rogue/migration.dm index a349ae395f..8745e4a88e 100644 --- a/code/controllers/subsystem/rogue/migration.dm +++ b/code/controllers/subsystem/rogue/migration.dm @@ -6,23 +6,31 @@ SUBSYSTEM_DEF(migrants) var/current_wave = null var/time_until_next_wave = 2 MINUTES var/wave_timer = 0 + var/time_between_waves = 3 MINUTES var/time_between_fail_wave = 90 SECONDS var/wave_wait_time = 30 SECONDS + var/list/spawned_waves = list() + + /datum/controller/subsystem/migrants/Initialize() return ..() + /datum/controller/subsystem/migrants/fire(resumed) process_migrants(2 SECONDS) update_ui() + /datum/controller/subsystem/migrants/proc/set_current_wave(wave_type, time) current_wave = wave_type wave_timer = time + /datum/controller/subsystem/migrants/proc/process_migrants(dt) if(current_wave) process_current_wave(dt) else process_next_wave(dt) + /datum/controller/subsystem/migrants/proc/process_current_wave(dt) wave_timer -= dt if(wave_timer > 0) @@ -45,6 +53,7 @@ SUBSYSTEM_DEF(migrants) set_current_wave(wave.downgrade_wave, wave_wait_time) else time_until_next_wave = time_between_fail_wave + /datum/controller/subsystem/migrants/proc/try_spawn_wave() var/datum/migrant_wave/wave = MIGRANT_WAVE(current_wave) /// Create initial assignment list @@ -56,9 +65,12 @@ SUBSYSTEM_DEF(migrants) assignments += new /datum/migrant_assignment(role_type) /// Shuffle assignments so role rolling is not consistent assignments = shuffle(assignments) + var/list/active_migrants = get_active_migrants() active_migrants = shuffle(active_migrants) + var/list/picked_migrants = list() + if(!length(active_migrants)) return FALSE /// Try to assign priority players to positions @@ -79,15 +91,18 @@ SUBSYSTEM_DEF(migrants) break if(!picked) continue + active_migrants -= picked assignment.client = picked picked_migrants += picked + /// Assign rest of the players to positions for(var/datum/migrant_assignment/assignment as anything in assignments) if(!length(active_migrants)) break // Out of migrants, we're screwed and will fail if(assignment.client) continue + var/client/picked for(var/client/client as anything in active_migrants) if(!can_be_role(client, assignment.role_type)) @@ -96,12 +111,15 @@ SUBSYSTEM_DEF(migrants) break if(!picked) continue + active_migrants -= picked assignment.client = picked picked_migrants += picked + /// Find spawn points for the assignments var/turf/spawn_location = get_spawn_turf_for_job(wave.spawn_landmark) var/atom/fallback_location = spawn_location + var/list/turfs = get_safe_turfs_around_location(spawn_location) for(var/i in 1 to turfs.len) var/turf/turf = turfs[i] @@ -109,19 +127,24 @@ SUBSYSTEM_DEF(migrants) break var/datum/migrant_assignment/assignment = assignments[i] assignment.spawn_location = turf + /// See if anything went wrong and return FALSE if it did for(var/datum/migrant_assignment/assignment as anything in assignments) if(!assignment.client) return FALSE if(!assignment.spawn_location) assignment.spawn_location = fallback_location + /// At this point everything is GOOD and SWELL, we want to spawn the wave + /// Unset their pref so if they respawn they wont get yoinked into migrants immediately for(var/client/client as anything in picked_migrants) client.prefs.migrant.post_spawn() + /// Spawn the migrants, hooray for(var/datum/migrant_assignment/assignment as anything in assignments) - spawn_migrant(wave, assignment) + spawn_migrant(wave, assignment, wave.spawn_on_location) + // Increment wave spawn counter var/used_wave_type = wave.type if(wave.shared_wave_type) @@ -129,7 +152,28 @@ SUBSYSTEM_DEF(migrants) if(!spawned_waves[used_wave_type]) spawned_waves[used_wave_type] = 0 spawned_waves[used_wave_type] += 1 + + message_admins("MIGRANTS: Spawned wave: [wave.name] (players: [assignments.len]) at [ADMIN_VERBOSEJMP(spawn_location)]") + + unset_all_active_migrants() + return TRUE + +/datum/controller/subsystem/migrants/proc/get_status_line() + var/string = "" + if(current_wave) + var/datum/migrant_wave/wave = MIGRANT_WAVE(current_wave) + string = "[wave.name] ([get_active_migrant_amount()]/[wave.get_roles_amount()]) - [wave_timer / (1 SECONDS)]s" + else + string = "Mist - [time_until_next_wave / (1 SECONDS)]s" + return "Migrants: [string]" + +/datum/controller/subsystem/migrants/proc/unset_all_active_migrants() + var/list/active_migrants = get_active_migrants() + if(active_migrants) + for(var/client/client as anything in active_migrants) + client.prefs.migrant.set_active(FALSE) + /datum/controller/subsystem/migrants/proc/get_safe_turfs_around_location(atom/location) var/list/turfs = list() var/turf/turfloc = get_turf(location) @@ -143,25 +187,37 @@ SUBSYSTEM_DEF(migrants) turfs += turf turfs = shuffle(turfs) return turfs -/datum/controller/subsystem/migrants/proc/spawn_migrant(datum/migrant_wave/wave, datum/migrant_assignment/assignment) + +/datum/controller/subsystem/migrants/proc/spawn_migrant(datum/migrant_wave/wave, datum/migrant_assignment/assignment, spawn_on_location) var/rank = "Migrant" var/mob/dead/new_player/newplayer = assignment.client.mob var/ckey = assignment.client.ckey + SSjob.AssignRole(newplayer, rank, TRUE) + var/mob/living/character = newplayer.create_character(TRUE) //creates the human and transfers vars and mind + character.islatejoin = TRUE SSjob.EquipRank(character, rank, TRUE) + var/datum/migrant_role/role = MIGRANT_ROLE(assignment.role_type) + character.migrant_type = assignment.role_type + + /// copy pasta from AttemptLateSpawn(rank) further on TODO put it in a proc and use in both places + /// Fade effect var/atom/movable/screen/splash/Spl = new(character.client, TRUE) Spl.Fade(TRUE) character.update_parallax_teleport() + var/mob/living/carbon/human/humanc if(ishuman(character)) humanc = character //Let's retypecast the var to be human, + SSticker.minds += character.mind GLOB.joined_player_list += character.ckey + if(humanc) var/fakekey = character.ckey if(ckey in GLOB.anonymize) @@ -175,24 +231,35 @@ SUBSYSTEM_DEF(migrants) GLOB.respawncounts[character.ckey] = AN else GLOB.respawncounts[character.ckey] = 1 + /// And back to non copy pasta code - character.forceMove(assignment.spawn_location) + if(spawn_on_location) + character.forceMove(assignment.spawn_location) + to_chat(character, span_alertsyndie("I am a [role.name]!")) to_chat(character, span_notice(wave.greet_text)) to_chat(character, span_notice(role.greet_text)) + if(role.outfit) var/datum/outfit/outfit = new role.outfit() outfit.equip(character) + if(role.antag_datum) character.mind.add_antag_datum(role.antag_datum) + // Adding antag datums can move your character to places, so here's a bandaid - character.forceMove(assignment.spawn_location) + if(spawn_on_location) + character.forceMove(assignment.spawn_location) + if(role.grant_lit_torch) grant_lit_torch(character) + role.after_spawn(character) + if(role.advclass_cat_rolls) SSrole_class_handler.setup_class_handler(character, role.advclass_cat_rolls) hugboxify_for_class_selection(character) + /datum/controller/subsystem/migrants/proc/get_priority_players(list/players, role_type) var/list/priority = list() for(var/client/client as anything in players) @@ -200,6 +267,7 @@ SUBSYSTEM_DEF(migrants) continue priority += client return priority + /datum/controller/subsystem/migrants/proc/can_be_role(client/player, role_type) var/datum/migrant_role/role = MIGRANT_ROLE(role_type) if(!player) @@ -214,6 +282,7 @@ SUBSYSTEM_DEF(migrants) if(role.allowed_ages && !(prefs.age in role.allowed_ages)) return FALSE return TRUE + /datum/controller/subsystem/migrants/proc/process_next_wave(dt) time_until_next_wave -= dt if(time_until_next_wave > 0) @@ -224,10 +293,13 @@ SUBSYSTEM_DEF(migrants) set_current_wave(wave_type, wave_wait_time) time_until_next_wave = time_between_fail_wave + /datum/controller/subsystem/migrants/proc/roll_wave() var/list/available_weighted_waves = list() + var/active_migrants = get_active_migrant_amount() var/active_players = get_round_active_players() + for(var/wave_type in GLOB.migrant_waves) var/datum/migrant_wave/wave = MIGRANT_WAVE(wave_type) if(!wave.can_roll) @@ -247,17 +319,21 @@ SUBSYSTEM_DEF(migrants) if(spawned_waves[used_wave_type] && spawned_waves[used_wave_type] >= wave.max_spawns) continue available_weighted_waves[wave_type] = wave.weight + if(!length(available_weighted_waves)) return null return pickweight(available_weighted_waves) + /datum/controller/subsystem/migrants/proc/update_ui() for(var/client/client as anything in get_all_migrants()) client.prefs.migrant.show_ui() + /datum/controller/subsystem/migrants/proc/get_active_migrant_amount() var/list/migrants = get_active_migrants() if(migrants) return migrants.len return 0 + /datum/controller/subsystem/migrants/proc/get_stars_on_role(role_type) var/stars = 0 var/list/active_migrants = get_active_migrants() @@ -267,6 +343,7 @@ SUBSYSTEM_DEF(migrants) continue stars++ return stars + /datum/controller/subsystem/migrants/proc/get_round_active_players() var/active = 0 for(var/mob/player_mob as anything in GLOB.player_list) @@ -280,6 +357,7 @@ SUBSYSTEM_DEF(migrants) continue active++ return active + /// Returns a list of all newplayer clients with active migrant pref /datum/controller/subsystem/migrants/proc/get_active_migrants() var/list/migrants = list() @@ -292,6 +370,7 @@ SUBSYSTEM_DEF(migrants) continue migrants += player.client return migrants + /// Returns a list of all newplayer clients /datum/controller/subsystem/migrants/proc/get_all_migrants() var/list/migrants = list() @@ -302,6 +381,7 @@ SUBSYSTEM_DEF(migrants) continue migrants += player.client return migrants + /client/proc/admin_force_next_migrant_wave() set category = "GameMaster" set name = "Force Migrant Wave" @@ -316,6 +396,7 @@ SUBSYSTEM_DEF(migrants) message_admins("Admin [key_name_admin(user)] forced next migrant wave: [picked_wave_type] (Arrival: 1 Minute)") log_game("Admin [key_name_admin(user)] forced next migrant wave: [picked_wave_type] (Arrival: 1 Minute)") SSmigrants.set_current_wave(picked_wave_type, (1 MINUTES)) + /proc/get_spawn_turf_for_job(jobname) var/list/landmarks = list() for(var/obj/effect/landmark/start/sloc as anything in GLOB.start_landmarks_list) @@ -326,10 +407,12 @@ SUBSYSTEM_DEF(migrants) return null landmarks = shuffle(landmarks) return get_turf(pick(landmarks)) + /proc/hugboxify_for_class_selection(mob/living/carbon/human/character) character.advsetup = 1 character.invisibility = INVISIBILITY_MAXIMUM character.become_blind("advsetup") + if(GLOB.adventurer_hugbox_duration) ///FOR SOME RETARDED FUCKING REASON THIS REFUSED TO WORK WITHOUT A FUCKING TIMER IT JUST FUCKED SHIT UP addtimer(CALLBACK(character, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_start)), 1) @@ -338,27 +421,3 @@ SUBSYSTEM_DEF(migrants) var/obj/item/flashlight/flare/torch/torch = new() torch.spark_act() character.put_in_hands(torch, forced = TRUE) - -/mob/living/carbon/human/proc/adv_hugboxing_start() - to_chat(src, span_warning("I will be in danger once I start moving.")) - status_flags |= GODMODE - ADD_TRAIT(src, TRAIT_PACIFISM, "hugbox") - RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(adv_hugboxing_moved)) - //Lies, it goes away even if you don't move after enough time - if(GLOB.adventurer_hugbox_duration_still) - addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration_still) - -/mob/living/carbon/human/proc/adv_hugboxing_moved() - UnregisterSignal(src, COMSIG_MOVABLE_MOVED) - to_chat(src, span_danger("I have [DisplayTimeText(GLOB.adventurer_hugbox_duration)] to begone!")) - addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration) - -/mob/living/carbon/human/proc/adv_hugboxing_end() - if(QDELETED(src)) - return - //hugbox already ended - if(!(status_flags & GODMODE)) - return - status_flags &= ~GODMODE - REMOVE_TRAIT(src, TRAIT_PACIFISM, "hugbox") - to_chat(src, span_danger("My joy is gone! Danger surrounds me.")) diff --git a/code/datums/migrants/migrant_pref.dm b/code/datums/migrants/migrant_pref.dm index d63b774a01..ad50beb767 100644 --- a/code/datums/migrants/migrant_pref.dm +++ b/code/datums/migrants/migrant_pref.dm @@ -8,11 +8,18 @@ /datum/migrant_pref/New(datum/preferences/passed_prefs) . = ..() prefs = passed_prefs -/datum/migrant_pref/proc/set_active(new_state) + +/datum/migrant_pref/proc/set_active(new_state, silent = FALSE) if(active == new_state) return active = new_state role_preferences.Cut() + if(!silent && prefs.parent) + if(new_state) + to_chat(prefs.parent, span_notice("You are now in the migrant queue, and will join the game with them when they arrive")) + else + to_chat(prefs.parent, span_boldwarning("You are no longer in the migrant queue")) + /datum/migrant_pref/proc/toggle_role_preference(role_type) if(role_type in role_preferences) role_preferences -= role_type @@ -21,10 +28,15 @@ role_preferences.Cut() if(SSmigrants.can_be_role(prefs.parent, role_type)) role_preferences += role_type + var/datum/migrant_role/role = MIGRANT_ROLE(role_type) + to_chat(prefs.parent, span_nicegreen("You have prioritizd the [role.name]. This does not guarantee getting the role")) else to_chat(prefs.parent, span_warning("You can't be this role. (Wrong species, gender or age)")) + /datum/migrant_pref/proc/post_spawn() - set_active(FALSE) + set_active(FALSE, TRUE) + hide_ui() + /datum/migrant_pref/proc/show_ui() var/client/client = prefs.parent if(!client) @@ -55,6 +67,7 @@ popup.set_window_options("can_close=0") popup.set_content(dat.Join()) popup.open(FALSE) + /datum/migrant_pref/Topic(href, href_list) var/client/client = prefs.parent if(!client) @@ -66,3 +79,34 @@ var/role_type = text2path(href_list["role"]) toggle_role_preference(role_type) show_ui() + +/datum/migrant_pref/proc/hide_ui() + var/client/client = prefs.parent + if(!client) + return + client.mob << browse(null, "window=migration") + + +/mob/living/carbon/human/proc/adv_hugboxing_start() + to_chat(src, span_warning("I will be in danger once I start moving.")) + status_flags |= GODMODE + ADD_TRAIT(src, TRAIT_PACIFISM, "hugbox") + RegisterSignal(src, COMSIG_MOVABLE_MOVED, PROC_REF(adv_hugboxing_moved)) + //Lies, it goes away even if you don't move after enough time + if(GLOB.adventurer_hugbox_duration_still) + addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration_still) + +/mob/living/carbon/human/proc/adv_hugboxing_moved() + UnregisterSignal(src, COMSIG_MOVABLE_MOVED) + to_chat(src, span_danger("I have [DisplayTimeText(GLOB.adventurer_hugbox_duration)] to begone!")) + addtimer(CALLBACK(src, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_end)), GLOB.adventurer_hugbox_duration) + +/mob/living/carbon/human/proc/adv_hugboxing_end() + if(QDELETED(src)) + return + //hugbox already ended + if(!(status_flags & GODMODE)) + return + status_flags &= ~GODMODE + REMOVE_TRAIT(src, TRAIT_PACIFISM, "hugbox") + to_chat(src, span_danger("My joy is gone! Danger surrounds me.")) diff --git a/code/datums/migrants/migrant_role.dm b/code/datums/migrants/migrant_role.dm index 40b324b660..02974ebf58 100644 --- a/code/datums/migrants/migrant_role.dm +++ b/code/datums/migrants/migrant_role.dm @@ -18,14 +18,21 @@ var/greet_text /// Whether to grant a lit torch upon spawn var/grant_lit_torch = FALSE + /// Whether to show wanderer examine like adventurers or pilgrims + var/show_wanderer_examine = TRUE + var/advjob_examine = TRUE + /datum/migrant_role/proc/after_spawn(mob/living/carbon/human/character) return + /datum/migrant_role/pilgrim name = "Pilgrim" advclass_cat_rolls = list(CTAG_PILGRIM = 10) + /datum/migrant_role/adventurer name = "Adventurer" advclass_cat_rolls = list(CTAG_ADVENTURER = 5) + /datum/migrant_role/bandit name = "Bandit" antag_datum = /datum/antagonist/bandit diff --git a/code/datums/migrants/migrant_wave.dm b/code/datums/migrants/migrant_wave.dm index 3fde555ced..cf56a20ad8 100644 --- a/code/datums/migrants/migrant_wave.dm +++ b/code/datums/migrants/migrant_wave.dm @@ -26,6 +26,15 @@ var/downgrade_wave /// If defined, this will be the wave type to increment for purposes of checking `max_spawns` var/shared_wave_type = null + /// Whether we want to spawn people on the rolled location, this may not be desired for bandits or other things that set the location + var/spawn_on_location = TRUE + +/datum/migrant_wave/proc/get_roles_amount() + var/amount = 0 + for(var/role_type in roles) + amount += roles[role_type] + return amount + /datum/migrant_wave/pilgrim name = "Pilgrimage" downgrade_wave = /datum/migrant_wave/pilgrim_down_one @@ -33,6 +42,7 @@ /datum/migrant_role/pilgrim = 4, ) greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." + /datum/migrant_wave/pilgrim_down_one name = "Pilgrimage" downgrade_wave = /datum/migrant_wave/pilgrim_down_two @@ -41,6 +51,7 @@ /datum/migrant_role/pilgrim = 3, ) greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." + /datum/migrant_wave/pilgrim_down_two name = "Pilgrimage" downgrade_wave = /datum/migrant_wave/pilgrim_down_three @@ -49,6 +60,7 @@ /datum/migrant_role/pilgrim = 2, ) greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." + /datum/migrant_wave/pilgrim_down_three name = "Pilgrimage" can_roll = FALSE @@ -56,6 +68,7 @@ /datum/migrant_role/pilgrim = 1, ) greet_text = "Fleeing from misfortune and hardship, you and a handful of survivors get closer to Rockhill, looking for refuge and work, finally almost being there, almost..." + /datum/migrant_wave/adventurer name = "Adventure Party" downgrade_wave = /datum/migrant_wave/adventurer_down_one @@ -63,6 +76,7 @@ /datum/migrant_role/adventurer = 4, ) greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." + /datum/migrant_wave/adventurer_down_one name = "Adventure Party" downgrade_wave = /datum/migrant_wave/adventurer_down_two @@ -71,6 +85,7 @@ /datum/migrant_role/adventurer = 3, ) greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." + /datum/migrant_wave/adventurer_down_two name = "Adventure Party" downgrade_wave = /datum/migrant_wave/adventurer_down_three @@ -79,6 +94,7 @@ /datum/migrant_role/adventurer = 2, ) greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." + /datum/migrant_wave/adventurer_down_three name = "Adventure Party" can_roll = FALSE @@ -86,13 +102,15 @@ /datum/migrant_role/adventurer = 1, ) greet_text = "Together with a party of trusted friends we decided to venture out, seeking thrills, glory and treasure, ending up in the misty and damp bog underneath Rockhill, perhaps getting ourselves into more than what we bargained for." + /datum/migrant_wave/bandit name = "Bandit Raid" downgrade_wave = /datum/migrant_wave/bandit_down_one - weight = 5 + weight = 8 roles = list( /datum/migrant_role/bandit = 4, ) + /datum/migrant_wave/bandit_down_one name = "Bandit Raid" downgrade_wave = /datum/migrant_wave/bandit_down_two @@ -100,6 +118,7 @@ roles = list( /datum/migrant_role/bandit = 3, ) + /datum/migrant_wave/bandit_down_two name = "Bandit Raid" downgrade_wave = /datum/migrant_wave/bandit_down_three @@ -107,6 +126,7 @@ roles = list( /datum/migrant_role/bandit = 2, ) + /datum/migrant_wave/bandit_down_three name = "Bandit Raid" can_roll = FALSE diff --git a/code/datums/mind.dm b/code/datums/mind.dm index 11600ee468..edee6799df 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -120,12 +120,7 @@ if(!known_people[H.real_name]) known_people[H.real_name] = list() known_people[H.real_name]["VCOLOR"] = H.voice_color - var/used_title - if(H.job) - var/datum/job/J = SSjob.GetJob(H.job) - used_title = J.title - if(H.gender == FEMALE && J.f_title) - used_title = J.f_title + var/used_title = H.get_role_title() if(!used_title) used_title = "unknown" known_people[H.real_name]["FJOB"] = used_title diff --git a/code/modules/jobs/job_types/_job.dm b/code/modules/jobs/job_types/_job.dm index 1c09267f57..b8fc79eec9 100644 --- a/code/modules/jobs/job_types/_job.dm +++ b/code/modules/jobs/job_types/_job.dm @@ -120,6 +120,7 @@ */ var/list/advclass_cat_rolls + var/wanderer_examine = FALSE /datum/job/proc/special_job_check(mob/dead/new_player/player) return TRUE diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm index e2dde06711..df5f86c7d4 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm @@ -28,6 +28,8 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) bypass_lastclass = TRUE advclass_cat_rolls = list(CTAG_ADVENTURER = 15) + wanderer_examine = TRUE + /datum/job/roguetown/adventurer/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 3b1132783a..4e2a43f9d3 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -44,19 +44,23 @@ var/used_name = name if(isobserver(user)) used_name = real_name - if(job) + var/used_title = get_role_title() + var/display_as_wanderer = FALSE + var/is_returning = FALSE + if(migrant_type) + var/datum/migrant_role/migrant = MIGRANT_ROLE(migrant_type) + if(migrant.show_wanderer_examine) + display_as_wanderer = TRUE + else if(job) var/datum/job/J = SSjob.GetJob(job) - var/used_title = J.title - if(gender == FEMALE && J.f_title) - used_title = J.f_title - if(used_title == "Adventurer") - used_title = advjob - . = list("ø ------------ ø\nThis is [used_name], the wandering [race_name] [used_title].") - else - if(islatejoin) - . = list("ø ------------ ø\nThis is [used_name], the returning [race_name] [used_title].") - else - . = list("ø ------------ ø\nThis is [used_name], the [race_name] [used_title].") + if(J.wanderer_examine) + display_as_wanderer = TRUE + if(islatejoin) + is_returning = TRUE + if(display_as_wanderer) + . = list("ø ------------ ø\nThis is [used_name], the wandering [race_name].") + else if(used_title) + . = list("ø ------------ ø\nThis is [used_name], the [is_returning ? "returning " : ""][race_name] [used_title].") else . = list("ø ------------ ø\nThis is the [used_name], the [race_name].") diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm index 9cda5d20d2..dc45d4621f 100644 --- a/code/modules/mob/mob_defines.dm +++ b/code/modules/mob/mob_defines.dm @@ -168,6 +168,7 @@ /// What job does this mob have var/job = null//Living + var/migrant_type = null /// A list of factions that this mob is currently in, for hostile mob targetting, amongst other things var/list/faction = list("neutral") diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm index 19a5ee554c..b3510f50d3 100644 --- a/code/modules/mob/mob_helpers.dm +++ b/code/modules/mob/mob_helpers.dm @@ -928,3 +928,17 @@ ///Can the mob see reagents inside of containers? /mob/proc/can_see_reagents() return stat == DEAD || has_unlimited_silicon_privilege //Dead guys and silicons can always see reagents + +/mob/proc/get_role_title() + var/used_title + if(migrant_type) + var/datum/migrant_role/migrant = MIGRANT_ROLE(migrant_type) + used_title = migrant.name + else if(job) + var/datum/job/J = SSjob.GetJob(job) + if(!J) + return "unknown" + used_title = J.title + if(J.f_title) + used_title = J.f_title + return used_title From 415ee5014a92d72b2777dcaca4b3d43360c19b2c Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:46:05 -0800 Subject: [PATCH 3/9] Update goblin.dm --- code/modules/mob/living/carbon/human/npc/goblin.dm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/code/modules/mob/living/carbon/human/npc/goblin.dm b/code/modules/mob/living/carbon/human/npc/goblin.dm index cd7dd6cf4b..4b36ba042a 100644 --- a/code/modules/mob/living/carbon/human/npc/goblin.dm +++ b/code/modules/mob/living/carbon/human/npc/goblin.dm @@ -31,8 +31,10 @@ race = /datum/species/goblin/hell /mob/living/carbon/human/species/goblin/npc/hell race = /datum/species/goblin/hell + /mob/living/carbon/human/species/goblin/npc/ambush/hell race = /datum/species/goblin/hell + /datum/species/goblin/hell name = "hell goblin" id = "goblin_hell" @@ -41,10 +43,13 @@ /mob/living/carbon/human/species/goblin/cave name = "cave goblin" race = /datum/species/goblin/cave + /mob/living/carbon/human/species/goblin/npc/cave race = /datum/species/goblin/cave + /mob/living/carbon/human/species/goblin/npc/ambush/cave race = /datum/species/goblin/cave + /datum/species/goblin/cave id = "goblin_cave" raceicon = "goblin_cave" From c1e30e83b40af3b53be4237cc8e1f4587a097659 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:53:01 -0800 Subject: [PATCH 4/9] Create npc_outfit_equipper.dm --- .../mapping/roguetown/npc_outfit_equipper.dm | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 code/modules/mapping/roguetown/npc_outfit_equipper.dm diff --git a/code/modules/mapping/roguetown/npc_outfit_equipper.dm b/code/modules/mapping/roguetown/npc_outfit_equipper.dm new file mode 100644 index 0000000000..be2d720e61 --- /dev/null +++ b/code/modules/mapping/roguetown/npc_outfit_equipper.dm @@ -0,0 +1,17 @@ +/obj/effect/mapping_helpers/outfit_handler + name = "generic outfit equipper (SET PATH IN VARS)" + icon_state = "dress" + icon = 'icons/roguetown/clothing/armor.dmi' + alpha = 155 //so its easier to tell apart + var/datum/outfit/outfit_to_equip + +/obj/effect/mapping_helpers/ianbirthday/admin/LateInitialize() + if(!outfit_to_equip) + qdel(src) + return + var/mob/living/carbon/human/located = locate(/mob/living/carbon/human) in get_turf(src) + if(!located) + qdel(src) + return + located.equipOutfit(outfit_to_equip) + qdel(src) From 51573fa3dd8190fd747c05f6e6d37084981ba6f8 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:53:29 -0800 Subject: [PATCH 5/9] done --- stonekeep.dme | 1 + 1 file changed, 1 insertion(+) diff --git a/stonekeep.dme b/stonekeep.dme index 935edd98a2..25cfbf53f7 100644 --- a/stonekeep.dme +++ b/stonekeep.dme @@ -1513,6 +1513,7 @@ #include "code\modules\mapping\reader.dm" #include "code\modules\mapping\ruins.dm" #include "code\modules\mapping\verify.dm" +#include "code\modules\mapping\roguetown\npc_outfit_equipper.dm" #include "code\modules\mapping\space_management\multiz_helpers.dm" #include "code\modules\mapping\space_management\space_level.dm" #include "code\modules\mapping\space_management\space_reservation.dm" From dd993e16211748d036e601f0ef81894955ea5c8e Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:53:41 -0800 Subject: [PATCH 6/9] Update npc_outfit_equipper.dm --- code/modules/mapping/roguetown/npc_outfit_equipper.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mapping/roguetown/npc_outfit_equipper.dm b/code/modules/mapping/roguetown/npc_outfit_equipper.dm index be2d720e61..d73bdcc044 100644 --- a/code/modules/mapping/roguetown/npc_outfit_equipper.dm +++ b/code/modules/mapping/roguetown/npc_outfit_equipper.dm @@ -5,7 +5,7 @@ alpha = 155 //so its easier to tell apart var/datum/outfit/outfit_to_equip -/obj/effect/mapping_helpers/ianbirthday/admin/LateInitialize() +/obj/effect/mapping_helpers/outfit_handler/LateInitialize() if(!outfit_to_equip) qdel(src) return From e2fa1cd6d2b3da1b7515a86777231d67506ab83c Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:58:21 -0800 Subject: [PATCH 7/9] whoops --- code/modules/mapping/roguetown/npc_outfit_equipper.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/mapping/roguetown/npc_outfit_equipper.dm b/code/modules/mapping/roguetown/npc_outfit_equipper.dm index d73bdcc044..02563cef17 100644 --- a/code/modules/mapping/roguetown/npc_outfit_equipper.dm +++ b/code/modules/mapping/roguetown/npc_outfit_equipper.dm @@ -1,8 +1,9 @@ /obj/effect/mapping_helpers/outfit_handler name = "generic outfit equipper (SET PATH IN VARS)" - icon_state = "dress" + icon_state = "plate_alt" icon = 'icons/roguetown/clothing/armor.dmi' alpha = 155 //so its easier to tell apart + late = TRUE var/datum/outfit/outfit_to_equip /obj/effect/mapping_helpers/outfit_handler/LateInitialize() From 361a6c1180979555313eb62b0b0da5690be66159 Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 13:59:55 -0800 Subject: [PATCH 8/9] since we now have a job helper I need to ensure the skills are only added if they have a mind. --- code/datums/character_flaw/_character_flaw.dm | 2 +- code/datums/migrants/waves/heartfell_wave.dm | 130 +++++++++--------- .../antagonists/roguetown/villain/bandit.dm | 76 +++++----- .../antagonists/roguetown/villain/lich.dm | 28 ++-- .../roguetown/villain/vampirelord.dm | 12 +- .../adventurer/types/combat/amazon.dm | 24 ++-- .../adventurer/types/combat/barbarian.dm | 32 ++--- .../adventurer/types/combat/cleric.dm | 22 +-- .../adventurer/types/combat/dbomb.dm | 22 +-- .../types/combat/donator/bladesinger.dm | 18 +-- .../types/combat/donator/hoplite.dm | 18 +-- .../types/combat/donator/longbeard.dm | 24 ++-- .../types/combat/donator/paladin.dm | 20 +-- .../types/combat/donator/swordmaster.dm | 12 +- .../types/combat/donator/vaquero.dm | 30 ++-- .../adventurer/types/combat/dwarfranger.dm | 26 ++-- .../roguetown/adventurer/types/combat/mage.dm | 12 +- .../roguetown/adventurer/types/combat/monk.dm | 16 +-- .../adventurer/types/combat/ranger.dm | 32 ++--- .../adventurer/types/combat/rare/assassin.dm | 60 ++++---- .../types/combat/rare/freelancer.dm | 12 +- .../adventurer/types/combat/rare/heartfelt.dm | 24 ++-- .../types/combat/rare/heartfelthand.dm | 20 +-- .../adventurer/types/combat/rare/qatil.dm | 28 ++-- .../adventurer/types/combat/rare/sentinel.dm | 20 +-- .../types/combat/rare/swashbuckler.dm | 24 ++-- .../types/combat/rare/treasurehunter.dm | 26 ++-- .../types/combat/rare/witchhunter.dm | 26 ++-- .../adventurer/types/combat/rogue.dm | 32 ++--- .../adventurer/types/combat/sorceress.dm | 12 +- .../adventurer/types/combat/warrior.dm | 38 ++--- .../adventurer/types/pilgrim/bard.dm | 28 ++-- .../adventurer/types/pilgrim/blacksmith.dm | 38 ++--- .../adventurer/types/pilgrim/briar.dm | 30 ++-- .../adventurer/types/pilgrim/carpenter.dm | 22 +-- .../adventurer/types/pilgrim/cheesemaker.dm | 18 +-- .../adventurer/types/pilgrim/fisher.dm | 18 +-- .../adventurer/types/pilgrim/hunter.dm | 36 ++--- .../adventurer/types/pilgrim/miner.dm | 26 ++-- .../adventurer/types/pilgrim/noble.dm | 22 +-- .../adventurer/types/pilgrim/peasant.dm | 24 ++-- .../adventurer/types/pilgrim/physicker.dm | 12 +- .../adventurer/types/pilgrim/rare/Lcarp.dm | 22 +-- .../adventurer/types/pilgrim/rare/Lchef.dm | 22 +-- .../adventurer/types/pilgrim/rare/Lfish.dm | 46 +++---- .../adventurer/types/pilgrim/rare/Lmason.dm | 28 ++-- .../adventurer/types/pilgrim/rare/Lminer.dm | 30 ++-- .../adventurer/types/pilgrim/rare/Lpeasant.dm | 32 ++--- .../adventurer/types/pilgrim/rare/Lsmith.dm | 46 +++---- .../types/pilgrim/rare/grenzelhoft.dm | 24 ++-- .../adventurer/types/pilgrim/rare/merchant.dm | 24 ++-- .../adventurer/types/pilgrim/rare/preacher.dm | 8 +- .../types/pilgrim/rare/zybantine.dm | 24 ++-- .../adventurer/types/pilgrim/weaver.dm | 18 +-- .../adventurer/types/pilgrim/woodcutter.dm | 22 +-- .../adventurer/types/special/crusader.dm | 34 ++--- .../types/special/whitecheesemaker.dm | 38 ++--- .../roguetown/apprentices/bapprentice.dm | 20 +-- .../job_types/roguetown/apprentices/prince.dm | 34 ++--- .../roguetown/apprentices/servant.dm | 22 +-- .../job_types/roguetown/apprentices/squire.dm | 24 ++-- .../roguetown/apprentices/wapprentice.dm | 16 +-- .../jobs/job_types/roguetown/church/adept.dm | 54 ++++---- .../job_types/roguetown/church/inquisitor.dm | 28 ++-- .../jobs/job_types/roguetown/church/monk.dm | 20 +-- .../jobs/job_types/roguetown/church/priest.dm | 24 ++-- .../job_types/roguetown/church/templar.dm | 18 +-- .../roguetown/garrison/dungeoneer.dm | 22 +-- .../roguetown/garrison/garrisonarcher.dm | 26 ++-- .../roguetown/garrison/garrisonguard.dm | 82 +++++------ .../job_types/roguetown/garrison/mayor.dm | 28 ++-- .../roguetown/garrison/royalguard.dm | 26 ++-- .../job_types/roguetown/garrison/veteran.dm | 30 ++-- .../job_types/roguetown/nobility/archivist.dm | 10 +- .../job_types/roguetown/nobility/captain.dm | 32 ++--- .../job_types/roguetown/nobility/feldsher.dm | 14 +- .../jobs/job_types/roguetown/nobility/hand.dm | 26 ++-- .../jobs/job_types/roguetown/nobility/lady.dm | 26 ++-- .../jobs/job_types/roguetown/nobility/lord.dm | 26 ++-- .../job_types/roguetown/nobility/magician.dm | 14 +- .../job_types/roguetown/nobility/merchant.dm | 16 +-- .../job_types/roguetown/nobility/nightman.dm | 14 +- .../job_types/roguetown/nobility/steward.dm | 12 +- .../job_types/roguetown/other/deathknight.dm | 16 +-- .../roguetown/other/merc_classes/anthrax.dm | 46 +++---- .../roguetown/other/merc_classes/blackoak.dm | 20 +-- .../other/merc_classes/boltslinger.dm | 32 ++--- .../other/merc_classes/grenzelhoft.dm | 24 ++-- .../other/merc_classes/steppesman.dm | 32 ++--- .../other/merc_classes/underdweller.dm | 32 ++--- .../roguetown/other/merc_classes/zybantine.dm | 28 ++-- .../jobs/job_types/roguetown/other/tester.dm | 26 ++-- .../job_types/roguetown/peasants/bathmaid.dm | 20 +-- .../job_types/roguetown/peasants/beggar.dm | 12 +- .../job_types/roguetown/peasants/butcher.dm | 20 +-- .../job_types/roguetown/peasants/butler.dm | 24 ++-- .../jobs/job_types/roguetown/peasants/cook.dm | 18 +-- .../job_types/roguetown/peasants/grabber.dm | 16 +-- .../roguetown/peasants/gravedigger.dm | 14 +- .../job_types/roguetown/peasants/jester.dm | 16 +-- .../job_types/roguetown/peasants/prisoner.dm | 22 +-- .../job_types/roguetown/peasants/soilson.dm | 26 ++-- .../jobs/job_types/roguetown/roguetown.dm | 4 +- .../job_types/roguetown/serfs/alchemist.dm | 8 +- .../job_types/roguetown/serfs/blacksmith.dm | 56 ++++---- .../jobs/job_types/roguetown/serfs/innkeep.dm | 12 +- .../jobs/job_types/roguetown/serfs/mason.dm | 28 ++-- .../jobs/job_types/roguetown/serfs/tailor.dm | 10 +- .../mob/living/carbon/human/npc/skeleton.dm | 26 ++-- 109 files changed, 1411 insertions(+), 1411 deletions(-) diff --git a/code/datums/character_flaw/_character_flaw.dm b/code/datums/character_flaw/_character_flaw.dm index ffd23ea8dd..9f628aa7e7 100644 --- a/code/datums/character_flaw/_character_flaw.dm +++ b/code/datums/character_flaw/_character_flaw.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(character_flaws, list("Alcoholic"=/datum/charflaw/addiction/alc . = ..() var/mob/living/carbon/human/H = user if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) /datum/charflaw/badsight/flaw_on_life(mob/user) if(!ishuman(user)) diff --git a/code/datums/migrants/waves/heartfell_wave.dm b/code/datums/migrants/waves/heartfell_wave.dm index 2bdb73303c..266dc8bffe 100644 --- a/code/datums/migrants/waves/heartfell_wave.dm +++ b/code/datums/migrants/waves/heartfell_wave.dm @@ -21,18 +21,18 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif beltl = /obj/item/rogueweapon/sword/long if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) @@ -67,14 +67,14 @@ id = /obj/item/clothing/ring/silver shoes = /obj/item/clothing/shoes/roguetown/shortboots if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) H.change_stat("speed", 2) @@ -105,16 +105,16 @@ mask = /obj/item/clothing/mask/rogue/spectacles/golden neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 3) @@ -146,18 +146,18 @@ else r_hand = /obj/item/rogueweapon/mace/goden/steel if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 1) H.change_stat("intelligence", 2) @@ -213,21 +213,21 @@ backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/poison,/obj/item/reagent_containers/glass/bottle/rogue/healthpot) ADD_TRAIT(H, TRAIT_SEEPRICES, "[type]") if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) H.change_stat("strength", -1) H.change_stat("constitution", -1) H.change_stat("intelligence", 4) @@ -269,15 +269,15 @@ /obj/item/needle/blessed = 1, ) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 3) H.change_stat("constitution", -1) diff --git a/code/modules/antagonists/roguetown/villain/bandit.dm b/code/modules/antagonists/roguetown/villain/bandit.dm index 4da41623f7..ac8b96cd68 100644 --- a/code/modules/antagonists/roguetown/villain/bandit.dm +++ b/code/modules/antagonists/roguetown/villain/bandit.dm @@ -88,13 +88,13 @@ if("Deserter") //well armored, polearm skill, shield skill. The heavy melee class. H.set_blindness(0) to_chat(H, span_warning("You were once a soldier employed under a lord, and left illegally. You're capable with armor, shields, and polearms.")) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) H.change_stat("strength", 2) H.change_stat("endurance", 1) @@ -105,7 +105,7 @@ beltl = /obj/item/rogueweapon/knife/hunting if(H.age == AGE_OLD) //old deserters are experts with polearms - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) var/helmet2choose = pickweight(list("Volfhelm" = 5, "Skullcap" = 2, "Barbute" = 1)) switch(helmet2choose) @@ -142,15 +142,15 @@ if("Poacher") //good perception, speed, bow skill, and knife skill. Also some cooking and skincrafting since they are poachers. The speedy ranged class. H.set_blindness(0) to_chat(H, span_warning("You illegally hunt within the lands of others, and are quite good at it.")) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC) H.change_stat("strength", 1) H.change_stat("endurance", 1) @@ -175,9 +175,9 @@ head = /obj/item/clothing/head/roguetown/helmet/leather/volfhelm if(H.age == AGE_OLD) //old poachers are better at their jobs - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) switch(pick(1,2,3)) if (1) @@ -190,14 +190,14 @@ if("Brigand") //good sword skill, shield skill, flail skill, mace skill, slightly speedy. Kind of an all rounder. H.set_blindness(0) to_chat(H, span_warning("You are experienced with using swords and clubs to threaten and rob others.")) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 1) @@ -241,16 +241,16 @@ H.cure_blind("TRAIT_GENERIC") // The commmon skills shared between all bandits - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) H.mind.teach_crafting_recipe(/datum/crafting_recipe/bandit_volfhelm) H.mind.teach_crafting_recipe(/datum/crafting_recipe/cult_hood) diff --git a/code/modules/antagonists/roguetown/villain/lich.dm b/code/modules/antagonists/roguetown/villain/lich.dm index 3b31f8fee9..3265e944cf 100644 --- a/code/modules/antagonists/roguetown/villain/lich.dm +++ b/code/modules/antagonists/roguetown/villain/lich.dm @@ -87,20 +87,20 @@ beltr = /obj/item/reagent_containers/glass/bottle/rogue/manapot beltl = /obj/item/rogueweapon/knife/hunting r_hand = /obj/item/rogueweapon/polearm/woodstaff/quarterstaff - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 5) diff --git a/code/modules/antagonists/roguetown/villain/vampirelord.dm b/code/modules/antagonists/roguetown/villain/vampirelord.dm index e888201128..16bd8a8534 100644 --- a/code/modules/antagonists/roguetown/villain/vampirelord.dm +++ b/code/modules/antagonists/roguetown/villain/vampirelord.dm @@ -155,12 +155,12 @@ GLOBAL_LIST_EMPTY(vampire_objects) /datum/outfit/job/roguetown/vamplord/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/magic/blood, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/blood, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/vampire belt = /obj/item/storage/belt/rogue/leather/plaquegold diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm index 5efe09c388..2ec3a3786f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm @@ -11,18 +11,18 @@ /datum/outfit/job/roguetown/adventurer/amazon/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) neck = /obj/item/storage/belt/rogue/pouch/amazon backl = /obj/item/rogueweapon/polearm/spear backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm index 8b3803aad2..5ae5687b25 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm @@ -17,19 +17,19 @@ /datum/outfit/job/roguetown/adventurer/barbarian/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //funger reference - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //funger reference + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/barbrage) belt = /obj/item/storage/belt/rogue/leather shoes = /obj/item/clothing/shoes/roguetown/boots/leather @@ -52,13 +52,13 @@ switch(weapontype) if("Sword") beltr = /obj/item/rogueweapon/sword/iron - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) if("Club") beltr = /obj/item/rogueweapon/mace/woodclub - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) if("Axe") beltr = /obj/item/rogueweapon/axe/iron - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC) if(H.dna?.species) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm index 908fe4637c..3b85d9d7e5 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm @@ -70,18 +70,18 @@ if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm index 72b5581978..2f36b9a205 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm @@ -18,17 +18,17 @@ beltl = /obj/item/rogueweapon/pick beltr = /obj/item/rogueweapon/hammer backpack_contents = list(/obj/item/bomb = 1, /obj/item/flint = 1) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 1) switch(pick(1,2)) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm index d9190b15dc..835f5d0918 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm @@ -16,15 +16,15 @@ /datum/outfit/job/roguetown/adventurer/bladesinger/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) // Same stat spread as lancer/swordmaster, but gets a small bonus to speed instead of a malus, at the cost of getting no constitution bonus H.change_stat("endurance", 2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm index 0b0825b4c4..fea63c2573 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm @@ -13,12 +13,12 @@ /datum/outfit/job/roguetown/adventurer/hoplite/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) @@ -40,13 +40,13 @@ switch(weapontype) // We either get a spear (winged or regular), or a khopesh sword. The weapon we get is what we get our training in if("Khopesh") beltl = /obj/item/rogueweapon/sword/khopesh - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) if("Spear") backr = /obj/item/rogueweapon/polearm/spear/hoplite - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) if("WingedSpear") backr = /obj/item/rogueweapon/polearm/spear/hoplite/winged - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm index 5d13c96ab5..f211c09665 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm @@ -17,18 +17,18 @@ /datum/outfit/job/roguetown/adventurer/longbeard/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) // Same stat spread as lancer/swordmaster, but no -1 speed at the cost of 1 point of endurance. A very powerful dwarf indeed H.change_stat("constitution", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm index 902860432f..e0cbc1002f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm @@ -50,16 +50,16 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif gloves = /obj/item/clothing/gloves/roguetown/chain if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) backl = /obj/item/rogueweapon/sword/long/judgement H.change_stat("strength", 2) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm index bff5b58850..bc90006367 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm @@ -13,12 +13,12 @@ /datum/outfit/job/roguetown/adventurer/swordmaster/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm index 573f9d0c33..166d4621cc 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm @@ -19,21 +19,21 @@ /datum/outfit/job/roguetown/adventurer/vaquero/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) // Makes sense enough for an animal tamer - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) // How did they not have this skill before?! - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) // Makes sense enough for an animal tamer + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) // How did they not have this skill before?! + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots pants = /obj/item/clothing/under/roguetown/tights/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm index 03ab6a9c55..a01c1ac9dc 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm @@ -29,19 +29,19 @@ if(prob(23)) shoes = /obj/item/clothing/shoes/roguetown/boots/leather cloak = /obj/item/clothing/cloak/raincloak/brown - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("perception", 3) H.change_stat("speed", 1) // Fast... for a dwarf ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // Dwarf rangers are no good at dodging, but can wear heavier armor than typical rangers diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm index a551b72d1c..b7222cb185 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm @@ -29,16 +29,16 @@ beltl = /obj/item/reagent_containers/glass/bottle/rogue/manapot r_hand = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) if(H.age == AGE_OLD) head = /obj/item/clothing/head/roguetown/wizhat/gen armor = /obj/item/clothing/suit/roguetown/shirt/robe/plain backl = /obj/item/storage/backpack/rogue/backpack - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("strength", -2) H.change_stat("intelligence", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm index 3da4b3b903..f126441cad 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm @@ -31,14 +31,14 @@ backr = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, pick(1,1,2), TRUE) // Wood staff - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, pick(1,1,2), TRUE) // Wood staff + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) H.change_stat("strength", 3) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm index 7aa22fd3b1..59c534ac55 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm @@ -18,22 +18,22 @@ /datum/outfit/job/roguetown/adventurer/ranger/pre_equip(mob/living/carbon/human/H) ..() shoes = /obj/item/clothing/shoes/roguetown/boots/leather - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm index f6155cc3fa..69636f3e8a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm @@ -19,23 +19,23 @@ /datum/outfit/job/roguetown/adventurer/assassin/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Used for leaving notes after your evil work. + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Used for leaving notes after your evil work. var/datum/antagonist/new_antag = new /datum/antagonist/assassin() // Adds the assassin antag label. H.ambushable = FALSE H.mind.add_antag_datum(new_antag) @@ -47,7 +47,7 @@ switch(disguisechoice) if("Bard") - H.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) //Have to know to "PLAY" the part... Eh? Eh? + H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) //Have to know to "PLAY" the part... Eh? Eh? head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots pants = /obj/item/clothing/under/roguetown/tights/random @@ -77,7 +77,7 @@ pants = /obj/item/clothing/under/roguetown/tights/vagrant shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant if("Fisher") - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) //Have to know to play the part. + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) //Have to know to play the part. if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random @@ -105,8 +105,8 @@ beltl = /obj/item/flint backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1, /obj/item/natural/worms = 1, /obj/item/rogueweapon/shovel/small = 1) if("Hunter") - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //The assassin trades their crossbow abilities to match their disguise. - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, -2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //The assassin trades their crossbow abilities to match their disguise. + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, -2, TRUE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random shoes = /obj/item/clothing/shoes/roguetown/boots/leather @@ -120,9 +120,9 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/bait = 1, /obj/item/rogueweapon/knife/hunting = 1) gloves = /obj/item/clothing/gloves/roguetown/leather if("Miner") - H.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the pickaxe... - H.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the pickaxe... + H?.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) head = /obj/item/clothing/head/roguetown/armingcap pants = /obj/item/clothing/under/roguetown/trou armor = /obj/item/clothing/suit/roguetown/armor/gambeson/light/striped @@ -149,7 +149,7 @@ belt = /obj/item/storage/belt/rogue/leather/assassin id = /obj/item/clothing/ring/silver if(H.gender == MALE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) //The male noble's sword is less useful than the female noble's bow, so no downside. + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) //The male noble's sword is less useful than the female noble's bow, so no downside. pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/tunic/random cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -159,8 +159,8 @@ beltl = /obj/item/quiver/arrows backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) else - H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) //Female nobles get the male noble's bow, but are less trained than an Assassin disguising as a Hunter. Balance. - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, -1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) //Female nobles get the male noble's bow, but are less trained than an Assassin disguising as a Hunter. Balance. + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, -1, TRUE) shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/random head = /obj/item/clothing/head/roguetown/hatfur cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -169,7 +169,7 @@ beltl = /obj/item/quiver/arrows backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) if("Peasant") - H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/assassin shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random pants = /obj/item/clothing/under/roguetown/trou @@ -191,8 +191,8 @@ pants = null backpack_contents = list(/obj/item/neuFarm/seed/wheat=1,/obj/item/neuFarm/seed/apple=1,/obj/item/ash=1,/obj/item/rogueweapon/knife/villager=1) if("Woodcutter") - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the axe... - H.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the axe... + H?.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) belt = /obj/item/storage/belt/rogue/leather/assassin shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm index b42de59a71..7660647f59 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm @@ -14,12 +14,12 @@ /datum/outfit/job/roguetown/adventurer/lancer/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm index e86268016b..7851926bb9 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm @@ -26,18 +26,18 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif beltl = /obj/item/rogueweapon/sword/long if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm index cf94202a82..6bae412ad0 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm @@ -26,16 +26,16 @@ mask = /obj/item/clothing/mask/rogue/spectacles/golden neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm index fc2be8ff16..2f71d73b2c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm @@ -20,20 +20,20 @@ /datum/outfit/job/roguetown/adventurer/qatil/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) H.change_stat("strength", 1) H.change_stat("speed", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm index 9697705b79..c09772e05c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm @@ -26,16 +26,16 @@ /datum/outfit/job/roguetown/adventurer/sentinel/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm index 68ade6cd20..eeba2e77c8 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm @@ -31,18 +31,18 @@ /datum/outfit/job/roguetown/adventurer/swashbuckler/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm index 1938557131..d57452ee47 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm @@ -35,19 +35,19 @@ head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor neck = /obj/item/storage/belt/rogue/pouch if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 2) H.change_stat("intelligence", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm index d4553eb3e5..3087b22a29 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm @@ -32,19 +32,19 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("strength", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm index b4deaefc8a..a6b795d728 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm @@ -18,22 +18,22 @@ /datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H) ..() shoes = /obj/item/clothing/shoes/roguetown/boots - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, pick(0,0,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, pick(0,0,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) pants = /obj/item/clothing/under/roguetown/trou/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black gloves = /obj/item/clothing/gloves/roguetown/leather diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm index 3ab73f194c..20a41d2ef3 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm @@ -25,13 +25,13 @@ beltl = /obj/item/reagent_containers/glass/bottle/rogue/manapot r_hand = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 3) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm index 28ad161827..70dd911f98 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm @@ -19,20 +19,20 @@ /datum/outfit/job/roguetown/adventurer/sfighter/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" @@ -61,19 +61,19 @@ switch(weapontype) // We get +1 weapon skill in either axes/maces, swords, or flails depending on our starting weapon if("Axe") beltl = /obj/item/rogueweapon/axe/iron - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) if("Mace") beltl = /obj/item/rogueweapon/mace - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) if("Messer") beltl = /obj/item/rogueweapon/sword/scimitar/messer - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) if("Sword") beltl = /obj/item/rogueweapon/sword/iron - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) if("Flail") // Big roller gets one of the best weapons to pair with a shield, even if it is only iron tier. Lucky bastard beltl = /obj/item/rogueweapon/flail - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) if(prob(66)) neck = /obj/item/clothing/neck/roguetown/gorget diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm index 6a772158dc..60c7dda350 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm @@ -20,20 +20,20 @@ /datum/outfit/job/roguetown/adventurer/bard/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/mockery) head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm index 8f117a0817..2f4797f1f4 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm @@ -31,26 +31,26 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueore/coal=1, /obj/item/rogueore/iron=1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,0,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,1,2), TRUE) // For the bin - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,0,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,1,2), TRUE) // For the bin + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) if(prob(50)) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm index 821b28be1a..0b49132cff 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm @@ -31,23 +31,23 @@ if(H.patron != /datum/patron/divine/dendor) H.patron = GLOB.patronlist[/datum/patron/divine/dendor] - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) // the unique Dendor crafting recipes. Dendor shrines (pantheon cross) and alt cosmetic helmet H.mind.teach_crafting_recipe(/datum/crafting_recipe/dendor/visage) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm index 68dfc407ed..21d600a311 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm @@ -19,17 +19,17 @@ /datum/outfit/job/roguetown/adventurer/carpenter/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) head = /obj/item/clothing/head/roguetown/hatfur if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm index aa5d5e285b..f51ae50123 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm @@ -18,15 +18,15 @@ /datum/outfit/job/roguetown/adventurer/cheesemaker/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm index 82b7ad4630..7e6f555f9d 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm @@ -18,16 +18,16 @@ /datum/outfit/job/roguetown/adventurer/fisher/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) H.change_stat("constitution", 1) H.change_stat("perception", 1) else diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm index dbdc4caace..6d986ff321 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm @@ -32,25 +32,25 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/bait = 1, /obj/item/rogueweapon/knife/hunting = 1, /obj/item/flashlight/flare/torch/lantern = 1) gloves = /obj/item/clothing/gloves/roguetown/leather if(H.mind) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) else diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm index 5858a2ed32..145316e8e5 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm @@ -29,19 +29,19 @@ backl = /obj/item/storage/backpack/rogue/backpack backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/knife/villager = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm index e8fa6fae7d..fdb0f70184 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm @@ -27,13 +27,13 @@ H.real_name = "[honorary] [prev_real_name]" H.name = "[honorary] [prev_name]" - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) H.change_stat("intelligence", 1) shoes = /obj/item/clothing/shoes/roguetown/boots backl = /obj/item/storage/backpack/rogue/satchel @@ -42,8 +42,8 @@ id = /obj/item/clothing/ring/silver if(H.gender == FEMALE) H.change_stat("speed", 1) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/random head = /obj/item/clothing/head/roguetown/hatfur cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -53,8 +53,8 @@ backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) if(H.gender == MALE) H.change_stat("constitution", 1) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/tunic/random cloak = /obj/item/clothing/cloak/raincloak/furcloak diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm index 7c05a13251..4e0b7eb182 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm @@ -17,18 +17,18 @@ /datum/outfit/job/roguetown/adventurer/peasant/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, rand(2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, rand(2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) belt = /obj/item/storage/belt/rogue/leather/rope shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm index 7f968a89d1..e396be30be 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm @@ -31,13 +31,13 @@ neck = /obj/item/clothing/neck/roguetown/phys r_hand = /obj/item/storage/backpack/rogue/satchel/surgbag - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) H.change_stat("intelligence", 2) H.change_stat("speed", 1) ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm index e4e8435b4f..bf21ca462d 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm @@ -23,17 +23,17 @@ /datum/outfit/job/roguetown/adventurer/mastercarpenter/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) // They work at great heights. - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) // They work at great heights. + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) head = /obj/item/clothing/head/roguetown/hatfur armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm index 7a0240a76c..25ef4a23cb 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm @@ -23,16 +23,16 @@ /datum/outfit/job/roguetown/adventurer/masterchef/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 6, TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random @@ -47,7 +47,7 @@ H.change_stat("intelligence", 3) H.change_stat("constitution", 2) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) var/packcontents = pickweight(list("Honey" = 1, "Truffles" = 1, "Bacon" = 1)) // What is our special ingredient? Honey, truffles, or BACON? switch(packcontents) if("Honey") diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm index 69b23c9540..810c205037 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm @@ -36,19 +36,19 @@ beltl = /obj/item/rogueweapon/knife/hunting backpack_contents = list(/obj/item/natural/worms = 2,/obj/item/rogueweapon/shovel/small=1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.change_stat("constitution", 2) H.change_stat("perception", 2) else @@ -64,17 +64,17 @@ beltl = /obj/item/rogueweapon/knife/hunting backpack_contents = list(/obj/item/natural/worms = 2,/obj/item/rogueweapon/shovel/small=1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.change_stat("constitution", 2) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm index 987ebe687b..beb5108c90 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm @@ -14,20 +14,20 @@ /datum/outfit/job/roguetown/adventurer/grandmastermason/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) head = /obj/item/clothing/head/roguetown/hatblu armor = /obj/item/clothing/suit/roguetown/armor/leather/vest cloak = /obj/item/clothing/cloak/apron/waist/bar diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm index 6ee9d4b28b..43b3f80cdb 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm @@ -24,22 +24,22 @@ backl = /obj/item/storage/backpack/rogue/backpack if(H.age == AGE_OLD) H.change_stat("endurance", -1) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", 1) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm index ea0f4c975a..6d35c7af21 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm @@ -21,22 +21,22 @@ /datum/outfit/job/roguetown/adventurer/farmermaster/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) belt = /obj/item/storage/belt/rogue/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm index 68a18a3ac3..42c6f8a61f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm @@ -30,34 +30,34 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/tongs=1, /obj/item/rogueore/coal=1, /obj/item/rogueore/iron=1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,2,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, pick(0,1,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(0,1,1), TRUE) // 66% over 50% of normal smith - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, pick(1,2,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,2,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(0,1,1), TRUE) // 66% over 50% of normal smith + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(1,2,2), TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) // Wise still on every field, but gimped stats from age. H.change_stat("endurance", -1) H.change_stat("constitution", -1) H.change_stat("speed", -1) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) else // The actual stats H.change_stat("strength", 1) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm index 1b38641fb7..12ccfe89af 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm @@ -34,18 +34,18 @@ armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress/alt beltl = /obj/item/rogueweapon/sword/rapier/dec if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) var/prev_real_name = H.real_name var/prev_name = H.name var/honorary = "Count" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm index a0a42114db..dca2523d12 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm @@ -18,14 +18,14 @@ /datum/outfit/job/roguetown/adventurer/merchant/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tailor, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tailor, 1, TRUE) H.change_stat("intelligence", 2) H.change_stat("speed", 1) shoes = /obj/item/clothing/shoes/roguetown/boots @@ -50,15 +50,15 @@ switch(merchtype) if("FOOD") // Travelling food peddler backpack_contents = list(/obj/item/reagent_containers/food/snacks/rogue/meat/salami = 1, /obj/item/reagent_containers/food/snacks/rogue/meat/coppiette = 1, /obj/item/reagent_containers/food/snacks/rogue/cheddar = 1, /obj/item/reagent_containers/food/snacks/rogue/saltfish = 1, /obj/item/reagent_containers/food/snacks/rogue/crackerscooked = 1) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) if("HEAL") // Travelling potion seller (If only we had snake oil..) backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/manapot) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) if("SILK") // Travelling silk trader backpack_contents = list(/obj/item/natural/bundle/silk = 2, /obj/item/natural/fur = 1, /obj/item/natural/bundle/fibers = 2, /obj/item/clothing/suit/roguetown/shirt/dress/silkdress, /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) if("GEMS") // Travelling high-end merchant backpack_contents = list(/obj/item/roguegem/yellow, /obj/item/roguegem/yellow, /obj/item/roguegem/green, /obj/item/roguegem/green, /obj/item/roguegem/violet) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 1, TRUE) ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm index a2347de2b2..3d529eff43 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm @@ -26,10 +26,10 @@ r_hand = /obj/item/book/rogue/psybibble beltl = /obj/item/handheld_bell if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) if(!H.has_language(/datum/language/oldpsydonic)) H.grant_language(/datum/language/oldpsydonic) to_chat(H, "I can speak Old Psydonic with ,m before my speech.") diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm index 57e499be53..cc7986f32f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm @@ -39,18 +39,18 @@ // armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/silk_coat shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/black if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) var/prev_real_name = H.real_name var/prev_name = H.name var/honorary = "Emir" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm index daacfee8cd..dd7bb84b70 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm @@ -13,15 +13,15 @@ /datum/outfit/job/roguetown/adventurer/seamstress/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/cloth/lady pants = /obj/item/clothing/under/roguetown/tights/random shoes = /obj/item/clothing/shoes/roguetown/shortboots diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm index 8a90f34686..4d84dd3118 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm @@ -15,17 +15,17 @@ /datum/outfit/job/roguetown/adventurer/woodcutter/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm index a9ebda0f63..4bf0ea10f1 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm @@ -72,19 +72,19 @@ cloak = /obj/item/clothing/cloak/stabard/crusader // Gold version regardless of gender or patron wrists = /obj/item/clothing/neck/roguetown/psycross/silver - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("endurance", 2) H.change_stat("constitution", 2) H.change_stat("strength", 1) @@ -97,12 +97,12 @@ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow beltl = /obj/item/rogueweapon/knife/dagger/silver beltr = /obj/item/quiver/bolts - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) // Males are sword and shield based else - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE) // Finally, grant us the language if(!H.has_language(/datum/language/oldpsydonic)) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm index 393ae5b99b..bf70c2ee72 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm @@ -15,25 +15,25 @@ /datum/outfit/job/roguetown/adventurer/whitecheese/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, rand(4,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, rand(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, rand(4,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, rand(1,2), TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/black diff --git a/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm b/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm index 2f7b26a6cd..fc54e566a2 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm @@ -20,16 +20,16 @@ /datum/outfit/job/roguetown/bapprentice/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shoes = /obj/item/clothing/shoes/roguetown/simpleshoes diff --git a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm b/code/modules/jobs/job_types/roguetown/apprentices/prince.dm index 9418cd9f6a..3b06f5b04c 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/prince.dm @@ -39,15 +39,15 @@ beltr = /obj/item/storage/belt/rogue/pouch/coins/rich backr = /obj/item/storage/backpack/rogue/satchel if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) H.change_stat("constitution", 1) @@ -64,14 +64,14 @@ beltl = /obj/item/roguekey/manor backr = /obj/item/storage/backpack/rogue/satchel if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) H.change_stat("strength", -1) diff --git a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm b/code/modules/jobs/job_types/roguetown/apprentices/servant.dm index 442a0852a4..9b769a06b3 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/servant.dm @@ -29,17 +29,17 @@ ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(0,1,1), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt diff --git a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm index 578a631d9d..08e2d24d7d 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm @@ -50,17 +50,17 @@ H.change_stat("constitution", 1) H.change_stat("speed", 1) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.gender == MALE && H.dna?.species) H.dna.species.soundpack_m = new /datum/voicepack/male/squire() diff --git a/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm b/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm index 1be051266f..02ccaf04d7 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm @@ -21,14 +21,14 @@ /datum/outfit/job/roguetown/wapprentice/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random diff --git a/code/modules/jobs/job_types/roguetown/church/adept.dm b/code/modules/jobs/job_types/roguetown/church/adept.dm index 2a652eda56..9c3c443336 100644 --- a/code/modules/jobs/job_types/roguetown/church/adept.dm +++ b/code/modules/jobs/job_types/roguetown/church/adept.dm @@ -56,18 +56,18 @@ backpack_contents = list(/obj/item/keyring/shepherd = 1, /obj/item/rogueweapon/knife/dagger/silver = 1) //Stats for class - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", -2) H.change_stat("endurance", 1) @@ -98,21 +98,21 @@ backpack_contents = list(/obj/item/lockpick = 1, /obj/item/keyring/shepherd = 1, /obj/item/rogueweapon/knife/dagger/silver = 1) //Stats for class - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) H.change_stat("strength", -1) H.change_stat("perception", 2) H.change_stat("speed", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/inquisitor.dm b/code/modules/jobs/job_types/roguetown/church/inquisitor.dm index 0fe67118e1..4b5bdfdc3c 100644 --- a/code/modules/jobs/job_types/roguetown/church/inquisitor.dm +++ b/code/modules/jobs/job_types/roguetown/church/inquisitor.dm @@ -60,20 +60,20 @@ H.purchase_history = list() // Initialize as an empty list to track purchases if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) H.change_stat("intelligence", 2) H.change_stat("strength", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm index ae9d863761..7c6b63142a 100644 --- a/code/modules/jobs/job_types/roguetown/church/monk.dm +++ b/code/modules/jobs/job_types/roguetown/church/monk.dm @@ -75,17 +75,17 @@ if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) // They get this and a wooden staff to defend themselves - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) // They get this and a wooden staff to defend themselves + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("endurance", 2) // For casting lots of spells, and working long hours without sleep at the church H.change_stat("perception", -1) diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm index 40c0cd4e3e..fa41e27172 100644 --- a/code/modules/jobs/job_types/roguetown/church/priest.dm +++ b/code/modules/jobs/job_types/roguetown/church/priest.dm @@ -56,19 +56,19 @@ if(H.patron != /datum/patron/divine/dendor) // Astratans rule the church H.patron = GLOB.patronlist[/datum/patron/divine/astrata] - H.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) // Privilege of being the SECOND biggest target in the game, and arguably the worse of the two targets to lose - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) // Privilege of being the SECOND biggest target in the game, and arguably the worse of the two targets to lose + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", 1) // One slot and a VERY important role, it deserves a half-decent statline H.change_stat("intelligence", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/templar.dm b/code/modules/jobs/job_types/roguetown/church/templar.dm index a8b4331f46..694731d564 100644 --- a/code/modules/jobs/job_types/roguetown/church/templar.dm +++ b/code/modules/jobs/job_types/roguetown/church/templar.dm @@ -67,15 +67,15 @@ id = /obj/item/clothing/ring/silver gloves = /obj/item/clothing/gloves/roguetown/chain if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", 2) H.change_stat("constitution", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm index 7e5d10d5a1..d14ec99f4a 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm @@ -41,17 +41,17 @@ backr = /obj/item/storage/backpack/rogue/satchel // lack of satchel requires dealing with the merchant to correct, which requires entering town; not ideal. N. if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Allow reading notes passed to the literate noble prisoner, or writing reports. N. See peasants\prisoner.dm. - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Allow reading notes passed to the literate noble prisoner, or writing reports. N. See peasants\prisoner.dm. + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", -2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm b/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm index 4826290d7c..1bc3f44c1b 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm @@ -50,19 +50,19 @@ head = /obj/item/clothing/head/roguetown/roguehood/red if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // For rapier use - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // For rapier use + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("perception", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm b/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm index 4ce22b667f..38de28eaca 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm @@ -80,16 +80,16 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 2) H.change_stat("constitution", 1) @@ -115,15 +115,15 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 1) H.change_stat("constitution", 1) @@ -160,20 +160,20 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("perception", 2) H.change_stat("endurance", 1) H.change_stat("speed", 2) @@ -199,14 +199,14 @@ Design philosphy: neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/keyring/guard) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("endurance", 2) H.change_stat("speed", 2) ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm b/code/modules/jobs/job_types/roguetown/garrison/mayor.dm index 88b2daa39c..dadbed6899 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/mayor.dm @@ -43,21 +43,21 @@ beltl = /obj/item/flashlight/flare/torch/lantern r_hand = /obj/item/rogueweapon/polearm/woodstaff/quarterstaff if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 1) H.change_stat("intelligence", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm index 9d59efd887..8d5de79534 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm @@ -68,19 +68,19 @@ head = /obj/item/clothing/head/roguetown/helmet/sallet if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) H.change_stat("strength", 2) H.change_stat("perception", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm index 618aff8b17..79ccd51ee1 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm @@ -44,21 +44,21 @@ backl = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel/special = 1, /obj/item/signal_horn = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) H.change_stat("strength", 3) H.change_stat("perception", 1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm index a45df57c97..28f8c0c7c7 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm @@ -52,12 +52,12 @@ H.grant_language(/datum/language/celestial) H.grant_language(/datum/language/hellspeak) H.grant_language(/datum/language/oldpsydonic) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 8) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/captain.dm b/code/modules/jobs/job_types/roguetown/nobility/captain.dm index dffd759c10..bf8f61efb7 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/captain.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/captain.dm @@ -21,7 +21,7 @@ give_bank_account = 120 min_pq = 4 - cmode_music = 'sound/music/combat_noble.ogg' + cmode_music = 'sound/music/combat_noble.ogg' /datum/job/roguetown/captain/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() @@ -52,21 +52,21 @@ cloak = /obj/item/clothing/cloak/cape/guard backpack_contents = list(/obj/item/keyring/captain = 1, /obj/item/signal_horn = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm index 30eb396995..0128c7c116 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm @@ -43,15 +43,15 @@ beltl = /obj/item/keyring/doctor if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 4) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/hand.dm b/code/modules/jobs/job_types/roguetown/nobility/hand.dm index 1727e1918a..e38c1fa018 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/hand.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/hand.dm @@ -44,20 +44,20 @@ backr = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel = 1, /obj/item/keyring/hand = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) H.change_stat("strength", 1) H.change_stat("constitution", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/nobility/lady.dm b/code/modules/jobs/job_types/roguetown/nobility/lady.dm index 60a501dfbc..50e0a59b91 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lady.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lady.dm @@ -41,13 +41,13 @@ armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress/alt l_hand = /obj/item/rogueweapon/lordscepter if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) H.change_stat("speed", 2) @@ -58,13 +58,13 @@ id = /obj/item/clothing/ring/silver shoes = /obj/item/clothing/shoes/roguetown/shortboots if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - 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, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) /datum/job/roguetown/lady/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm index d116f6dfb5..c16ac2c9ee 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm @@ -45,20 +45,20 @@ id = /obj/item/clothing/ring/active/nomag l_hand = /obj/item/rogueweapon/lordscepter if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) diff --git a/code/modules/jobs/job_types/roguetown/nobility/magician.dm b/code/modules/jobs/job_types/roguetown/nobility/magician.dm index 36ea65be26..a79ab57666 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/magician.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/magician.dm @@ -39,13 +39,13 @@ shoes = /obj/item/clothing/shoes/roguetown/shortboots backpack_contents = list(/obj/item/scrying = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(6,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(6,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) if(H.age == AGE_OLD) armor = /obj/item/clothing/suit/roguetown/shirt/robe/courtmage H.change_stat("speed", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm index 958f7e8f41..9181db8560 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm @@ -55,11 +55,11 @@ H.change_stat("strength", -1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mathematics, 4, TRUE) // Literally unused skill - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mathematics, 4, TRUE) // Literally unused skill + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm index 62aaa56a94..a20ff57069 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm @@ -36,13 +36,13 @@ 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/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + 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/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/steward.dm b/code/modules/jobs/job_types/roguetown/nobility/steward.dm index 395aa18738..420ac7c12e 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/steward.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/steward.dm @@ -41,12 +41,12 @@ backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/rich = 1, /obj/item/lockpickring/mundane = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 6, TRUE) H.change_stat("strength", -2) H.change_stat("intelligence", 8) H.change_stat("constitution", -2) diff --git a/code/modules/jobs/job_types/roguetown/other/deathknight.dm b/code/modules/jobs/job_types/roguetown/other/deathknight.dm index c55e4e34c0..7370adb810 100644 --- a/code/modules/jobs/job_types/roguetown/other/deathknight.dm +++ b/code/modules/jobs/job_types/roguetown/other/deathknight.dm @@ -82,14 +82,14 @@ /datum/outfit/job/roguetown/deathknight/pre_equip(mob/living/carbon/human/H) ..() - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) belt = /obj/item/storage/belt/rogue/leather diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm index 4915e0bcb0..7be9a50836 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm @@ -17,15 +17,15 @@ backl = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/roguekey/mercenary, /obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/dagger/steel/dirk) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - 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/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + 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/riding, 3, TRUE) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) H.verbs |= /mob/living/carbon/human/proc/torture_victim //Secret police training owing to their origins. @@ -39,9 +39,9 @@ backr = /obj/item/rogueweapon/shield/tower/spidershield beltr = /obj/item/rogueweapon/whip/spiderwhip - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) H.change_stat("strength", 2) //Grenz merc statline but with maluses. H.change_stat("constitution", 1) @@ -62,17 +62,17 @@ beltr = /obj/item/quiver/arrows beltl = /obj/item/rogueweapon/sword/sabre/stalker - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) //Spread-out support skills, but inferior to Steppesman/Boltslinger. - H.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) //Spread-out support skills, but inferior to Steppesman/Boltslinger. + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) H.change_stat("speed", 2) //Speedier than a Steppesman, but not as tough or damaging. H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm index 25a79f5070..c528b94826 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm @@ -26,16 +26,16 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) H.merctype = 4 diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm index 0b15890ea6..c5d91affc6 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm @@ -33,22 +33,22 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/hunting) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.merctype = 6 diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm index 52c84e169a..6caf23a916 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm @@ -15,18 +15,18 @@ /datum/outfit/job/roguetown/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) //Big sword user so - really helps them. - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE) // Equal chance between skilled and average, can use a cudgel to beat less dangerous targets into submission - H.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) //Big sword user so - really helps them. + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE) // Equal chance between skilled and average, can use a cudgel to beat less dangerous targets into submission + H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm index bd044b1a6d..6e81d261ec 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm @@ -31,22 +31,22 @@ backr = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("perception", 1) H.change_stat("constitution", 1) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm index 9c3e88028e..204699c535 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm @@ -22,32 +22,32 @@ backl = /obj/item/storage/backpack/rogue/backpack backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor=1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("fortune", 1) H.change_stat("endurance", 1) H.change_stat("strength", 1) if(H.dna.species.id == "dwarf") H.cmode_music = 'sound/music/combat_dwarf.ogg' - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) head = /obj/item/clothing/head/roguetown/helmet/leather/minershelm beltl = /obj/item/rogueweapon/pick/paxe // Dorfs get a pick as their primary weapon and axes/maces to use it backr = /obj/item/rogueweapon/shield/wood else // No miner's helm for Delves as they haven nitevision now. - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) beltl = /obj/item/rogueweapon/sword/sabre // Dark elves get a sabre as their primary weapon and swords skill, who woulda thought diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm index 6a772ed3ab..a6bfce1f8d 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm @@ -35,20 +35,20 @@ H.grant_language(/datum/language/zybantine) to_chat(H, "I can speak Zybean with ,z before my speech.") if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,1,1), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,1,1), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.merctype = 1 diff --git a/code/modules/jobs/job_types/roguetown/other/tester.dm b/code/modules/jobs/job_types/roguetown/other/tester.dm index 9c05c3a817..65c5c1e583 100644 --- a/code/modules/jobs/job_types/roguetown/other/tester.dm +++ b/code/modules/jobs/job_types/roguetown/other/tester.dm @@ -45,17 +45,17 @@ pants = /obj/item/clothing/under/roguetown/tights/black beltr = /obj/item/rogueweapon/sword/sabre if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, rand(1,5), TRUE) H.change_stat("strength", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm index 01198ecd62..f0a527fc27 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm @@ -29,16 +29,16 @@ ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) // To wrestle people out of the baths - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick(1,1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) // To wrestle people out of the baths + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick(1,1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) if(H.gender == MALE) shoes = /obj/item/clothing/shoes/roguetown/boots/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan diff --git a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm index c83dde3bf7..d5bb75bbd6 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm @@ -54,12 +54,12 @@ if(prob(50)) shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant/l if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,2,3,4,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick (1,2,3,4,5), TRUE) // thug lyfe - H.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(2,3,4,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, pick(1,2,3), TRUE) // Street-fu - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, pick(1,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,2,3,4,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick (1,2,3,4,5), TRUE) // thug lyfe + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(2,3,4,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, pick(1,2,3), TRUE) // Street-fu + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, pick(1,2,3), TRUE) H.STALUC = rand(1, 20) if(prob(5)) r_hand = /obj/item/rogueweapon/mace/woodclub diff --git a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm index a7ced10540..13b08df1b1 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm @@ -48,14 +48,14 @@ H.change_stat("intelligence", -1) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) // Not a trained cook, but knows a thing or two - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) // Better than a soilson, but doesn't outshine a hunter or a weaver - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) // Not a trained cook, but knows a thing or two + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) // Better than a soilson, but doesn't outshine a hunter or a weaver + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 5, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/peasants/butler.dm b/code/modules/jobs/job_types/roguetown/peasants/butler.dm index 00f8c5dc0f..c7812e6499 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/butler.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/butler.dm @@ -26,18 +26,18 @@ backpack_contents = list(/obj/item/book/rogue/manners = 1) mask = /obj/item/clothing/mask/rogue/spectacles if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) // A well educated head of servants should at least have skilled literacy level - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,1,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // Privilege of living a life raising nobility. Knows the very basics about riding a mount + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) // A well educated head of servants should at least have skilled literacy level + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,1,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // Privilege of living a life raising nobility. Knows the very basics about riding a mount H.change_stat("strength", -1) H.change_stat("intelligence", 2) H.change_stat("perception", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/cook.dm b/code/modules/jobs/job_types/roguetown/peasants/cook.dm index 8069778bd9..9c5d2ed8fa 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/cook.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/cook.dm @@ -26,16 +26,16 @@ /datum/outfit/job/roguetown/cook/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/butchering, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/rope beltl = /obj/item/roguekey/tavern beltr = /obj/item/rogueweapon/knife/villager diff --git a/code/modules/jobs/job_types/roguetown/peasants/grabber.dm b/code/modules/jobs/job_types/roguetown/peasants/grabber.dm index f1b0fa2111..726f3448b4 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/grabber.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/grabber.dm @@ -29,14 +29,14 @@ /datum/outfit/job/roguetown/grabber/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) // You get a cudgel for nonlethal self defense and that's it. - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)//they can use the merchant machine and that's it - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) // You get a cudgel for nonlethal self defense and that's it. + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)//they can use the merchant machine and that's it + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) H.change_stat("strength", 1) if(H.gender == MALE) shoes = /obj/item/clothing/shoes/roguetown/boots/leather diff --git a/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm b/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm index 4f4ade9bc5..64ff1b3dc3 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm @@ -38,13 +38,13 @@ else armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/black if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/jester.dm b/code/modules/jobs/job_types/roguetown/peasants/jester.dm index 01289278e6..74b303071e 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/jester.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/jester.dm @@ -39,14 +39,14 @@ head = /obj/item/clothing/head/roguetown/jester neck = /obj/item/clothing/neck/roguetown/coif if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(4,4,5), TRUE) // Pirouette, but falling and hurting yourself IS pretty funny. - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(4,4,5), TRUE) // Pirouette, but falling and hurting yourself IS pretty funny. + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/mockery) // Mock people to your heart's content! H.STAINT = rand(1, 20) H.STALUC = rand(1, 20) diff --git a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm b/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm index 90a08fa322..d4b8ba4354 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm @@ -37,17 +37,17 @@ H.dropItemToGround(H.wear_mask, TRUE) qdel(I) if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) // given Noble trait. N. - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // given Noble trait. N. - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) // per suggestion. N. - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) // given Noble trait it makes no sense they were illiterate. N. - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // per suggestion. N. + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) // given Noble trait. N. + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // given Noble trait. N. + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) // per suggestion. N. + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) // given Noble trait it makes no sense they were illiterate. N. + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // per suggestion. N. H.change_stat("strength", -1) // Malnutrition. N. H.change_stat("perception", 2) // Few distractions, idle mind, focused senses. N. H.change_stat("intelligence", 2) // Given Noble trait it makes no sense they are idiots. N. diff --git a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm index 3a3bf2168b..3c712a0d24 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm @@ -30,19 +30,19 @@ /datum/outfit/job/roguetown/farmer/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // TODO! A way for them to operate submission holes without reading skill. Soilsons shouldn't be able to read. - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // TODO! A way for them to operate submission holes without reading skill. Soilsons shouldn't be able to read. + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("strength", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/roguetown.dm b/code/modules/jobs/job_types/roguetown/roguetown.dm index a364123162..5e03606f1f 100644 --- a/code/modules/jobs/job_types/roguetown/roguetown.dm +++ b/code/modules/jobs/job_types/roguetown/roguetown.dm @@ -64,9 +64,9 @@ H.dna.species.random_underwear(H.gender) if(H.dna.species) if(H.dna.species.id == "elf") - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.dna.species.id == "dwarf") - H.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) H.underwear_color = null H.update_body() diff --git a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm index 5071850431..9116753ff5 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm @@ -28,11 +28,11 @@ /datum/outfit/job/roguetown/alchemist/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(2,5), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(2,5), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(4,6), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(4,6), TRUE) //Requires a lot of sprites, so this is just a placeholder if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm index d04113342a..208dc33d6f 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm @@ -23,22 +23,22 @@ if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, pick(1,2), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou shoes = /obj/item/clothing/shoes/roguetown/simpleshoes/buckle @@ -87,22 +87,22 @@ if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) - H.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, pick(1,2), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou shoes = /obj/item/clothing/shoes/roguetown/boots/leather diff --git a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm index 60ad5b06bf..0f23ca9e37 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm @@ -27,12 +27,12 @@ /datum/outfit/job/roguetown/innkeep/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random diff --git a/code/modules/jobs/job_types/roguetown/serfs/mason.dm b/code/modules/jobs/job_types/roguetown/serfs/mason.dm index 44b5befb78..19b2f63242 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/mason.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/mason.dm @@ -28,20 +28,20 @@ /datum/outfit/job/roguetown/mason/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(2,2,3), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/labor/mining, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(2,2,3), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/labor/mining, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) head = /obj/item/clothing/head/roguetown/brimmed neck = /obj/item/clothing/neck/roguetown/coif diff --git a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm index 1a28ea198a..2f85c31d5a 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm @@ -21,11 +21,11 @@ shoes = /obj/item/clothing/shoes/roguetown/nobleboot head = /obj/item/clothing/head/roguetown/courtierhat if(H.mind) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, pick(3,4), TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/tanning, pick(3,4), TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, pick(3,4), TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/tanning, pick(3,4), TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/red diff --git a/code/modules/mob/living/carbon/human/npc/skeleton.dm b/code/modules/mob/living/carbon/human/npc/skeleton.dm index ea2c7b85d4..1286705dba 100644 --- a/code/modules/mob/living/carbon/human/npc/skeleton.dm +++ b/code/modules/mob/living/carbon/human/npc/skeleton.dm @@ -105,20 +105,20 @@ H.STAINT = 1 //light labor skills for skeleton manual labor and some warrior-adventurer skills, equipment is still bad probably - H.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/masonry, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.set_patron(/datum/patron/inhumen/zizo) ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) From 008c45a649bb32a29595a9405ebb874ba0fd2dbc Mon Sep 17 00:00:00 2001 From: dwasint <82520990+dwasint@users.noreply.github.com> Date: Sat, 16 Nov 2024 14:00:39 -0800 Subject: [PATCH 9/9] wrong way --- code/datums/character_flaw/_character_flaw.dm | 2 +- code/datums/migrants/waves/heartfell_wave.dm | 130 +++++++++--------- .../antagonists/roguetown/villain/bandit.dm | 76 +++++----- .../antagonists/roguetown/villain/lich.dm | 28 ++-- .../roguetown/villain/vampirelord.dm | 12 +- .../adventurer/types/combat/amazon.dm | 24 ++-- .../adventurer/types/combat/barbarian.dm | 32 ++--- .../adventurer/types/combat/cleric.dm | 22 +-- .../adventurer/types/combat/dbomb.dm | 22 +-- .../types/combat/donator/bladesinger.dm | 18 +-- .../types/combat/donator/hoplite.dm | 18 +-- .../types/combat/donator/longbeard.dm | 24 ++-- .../types/combat/donator/paladin.dm | 20 +-- .../types/combat/donator/swordmaster.dm | 12 +- .../types/combat/donator/vaquero.dm | 30 ++-- .../adventurer/types/combat/dwarfranger.dm | 26 ++-- .../roguetown/adventurer/types/combat/mage.dm | 12 +- .../roguetown/adventurer/types/combat/monk.dm | 16 +-- .../adventurer/types/combat/ranger.dm | 32 ++--- .../adventurer/types/combat/rare/assassin.dm | 60 ++++---- .../types/combat/rare/freelancer.dm | 12 +- .../adventurer/types/combat/rare/heartfelt.dm | 24 ++-- .../types/combat/rare/heartfelthand.dm | 20 +-- .../adventurer/types/combat/rare/qatil.dm | 28 ++-- .../adventurer/types/combat/rare/sentinel.dm | 20 +-- .../types/combat/rare/swashbuckler.dm | 24 ++-- .../types/combat/rare/treasurehunter.dm | 26 ++-- .../types/combat/rare/witchhunter.dm | 26 ++-- .../adventurer/types/combat/rogue.dm | 32 ++--- .../adventurer/types/combat/sorceress.dm | 12 +- .../adventurer/types/combat/warrior.dm | 38 ++--- .../adventurer/types/pilgrim/bard.dm | 28 ++-- .../adventurer/types/pilgrim/blacksmith.dm | 38 ++--- .../adventurer/types/pilgrim/briar.dm | 30 ++-- .../adventurer/types/pilgrim/carpenter.dm | 22 +-- .../adventurer/types/pilgrim/cheesemaker.dm | 18 +-- .../adventurer/types/pilgrim/fisher.dm | 18 +-- .../adventurer/types/pilgrim/hunter.dm | 36 ++--- .../adventurer/types/pilgrim/miner.dm | 26 ++-- .../adventurer/types/pilgrim/noble.dm | 22 +-- .../adventurer/types/pilgrim/peasant.dm | 24 ++-- .../adventurer/types/pilgrim/physicker.dm | 12 +- .../adventurer/types/pilgrim/rare/Lcarp.dm | 22 +-- .../adventurer/types/pilgrim/rare/Lchef.dm | 22 +-- .../adventurer/types/pilgrim/rare/Lfish.dm | 46 +++---- .../adventurer/types/pilgrim/rare/Lmason.dm | 28 ++-- .../adventurer/types/pilgrim/rare/Lminer.dm | 30 ++-- .../adventurer/types/pilgrim/rare/Lpeasant.dm | 32 ++--- .../adventurer/types/pilgrim/rare/Lsmith.dm | 46 +++---- .../types/pilgrim/rare/grenzelhoft.dm | 24 ++-- .../adventurer/types/pilgrim/rare/merchant.dm | 24 ++-- .../adventurer/types/pilgrim/rare/preacher.dm | 8 +- .../types/pilgrim/rare/zybantine.dm | 24 ++-- .../adventurer/types/pilgrim/weaver.dm | 18 +-- .../adventurer/types/pilgrim/woodcutter.dm | 22 +-- .../adventurer/types/special/crusader.dm | 34 ++--- .../types/special/whitecheesemaker.dm | 38 ++--- .../roguetown/apprentices/bapprentice.dm | 20 +-- .../job_types/roguetown/apprentices/prince.dm | 34 ++--- .../roguetown/apprentices/servant.dm | 22 +-- .../job_types/roguetown/apprentices/squire.dm | 24 ++-- .../roguetown/apprentices/wapprentice.dm | 16 +-- .../jobs/job_types/roguetown/church/adept.dm | 54 ++++---- .../job_types/roguetown/church/inquisitor.dm | 28 ++-- .../jobs/job_types/roguetown/church/monk.dm | 20 +-- .../jobs/job_types/roguetown/church/priest.dm | 24 ++-- .../job_types/roguetown/church/templar.dm | 18 +-- .../roguetown/garrison/dungeoneer.dm | 22 +-- .../roguetown/garrison/garrisonarcher.dm | 26 ++-- .../roguetown/garrison/garrisonguard.dm | 82 +++++------ .../job_types/roguetown/garrison/mayor.dm | 28 ++-- .../roguetown/garrison/royalguard.dm | 26 ++-- .../job_types/roguetown/garrison/veteran.dm | 30 ++-- .../job_types/roguetown/nobility/archivist.dm | 10 +- .../job_types/roguetown/nobility/captain.dm | 30 ++-- .../job_types/roguetown/nobility/feldsher.dm | 14 +- .../jobs/job_types/roguetown/nobility/hand.dm | 26 ++-- .../jobs/job_types/roguetown/nobility/lady.dm | 26 ++-- .../jobs/job_types/roguetown/nobility/lord.dm | 26 ++-- .../job_types/roguetown/nobility/magician.dm | 14 +- .../job_types/roguetown/nobility/merchant.dm | 16 +-- .../job_types/roguetown/nobility/nightman.dm | 14 +- .../job_types/roguetown/nobility/steward.dm | 12 +- .../job_types/roguetown/other/deathknight.dm | 16 +-- .../roguetown/other/merc_classes/anthrax.dm | 46 +++---- .../roguetown/other/merc_classes/blackoak.dm | 20 +-- .../other/merc_classes/boltslinger.dm | 32 ++--- .../other/merc_classes/grenzelhoft.dm | 24 ++-- .../other/merc_classes/steppesman.dm | 32 ++--- .../other/merc_classes/underdweller.dm | 32 ++--- .../roguetown/other/merc_classes/zybantine.dm | 28 ++-- .../jobs/job_types/roguetown/other/tester.dm | 26 ++-- .../job_types/roguetown/peasants/bathmaid.dm | 20 +-- .../job_types/roguetown/peasants/beggar.dm | 12 +- .../job_types/roguetown/peasants/butcher.dm | 20 +-- .../job_types/roguetown/peasants/butler.dm | 24 ++-- .../jobs/job_types/roguetown/peasants/cook.dm | 18 +-- .../job_types/roguetown/peasants/grabber.dm | 16 +-- .../roguetown/peasants/gravedigger.dm | 14 +- .../job_types/roguetown/peasants/jester.dm | 16 +-- .../job_types/roguetown/peasants/prisoner.dm | 22 +-- .../job_types/roguetown/peasants/soilson.dm | 26 ++-- .../jobs/job_types/roguetown/roguetown.dm | 4 +- .../job_types/roguetown/serfs/alchemist.dm | 8 +- .../job_types/roguetown/serfs/blacksmith.dm | 56 ++++---- .../jobs/job_types/roguetown/serfs/innkeep.dm | 12 +- .../jobs/job_types/roguetown/serfs/mason.dm | 28 ++-- .../jobs/job_types/roguetown/serfs/tailor.dm | 10 +- .../mob/living/carbon/human/npc/skeleton.dm | 26 ++-- 109 files changed, 1410 insertions(+), 1410 deletions(-) diff --git a/code/datums/character_flaw/_character_flaw.dm b/code/datums/character_flaw/_character_flaw.dm index 9f628aa7e7..7e02297cb9 100644 --- a/code/datums/character_flaw/_character_flaw.dm +++ b/code/datums/character_flaw/_character_flaw.dm @@ -107,7 +107,7 @@ GLOBAL_LIST_INIT(character_flaws, list("Alcoholic"=/datum/charflaw/addiction/alc . = ..() var/mob/living/carbon/human/H = user if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) /datum/charflaw/badsight/flaw_on_life(mob/user) if(!ishuman(user)) diff --git a/code/datums/migrants/waves/heartfell_wave.dm b/code/datums/migrants/waves/heartfell_wave.dm index 266dc8bffe..f7bcd3c11c 100644 --- a/code/datums/migrants/waves/heartfell_wave.dm +++ b/code/datums/migrants/waves/heartfell_wave.dm @@ -21,18 +21,18 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif beltl = /obj/item/rogueweapon/sword/long if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) @@ -67,14 +67,14 @@ id = /obj/item/clothing/ring/silver shoes = /obj/item/clothing/shoes/roguetown/shortboots if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) H.change_stat("speed", 2) @@ -105,16 +105,16 @@ mask = /obj/item/clothing/mask/rogue/spectacles/golden neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 3) @@ -146,18 +146,18 @@ else r_hand = /obj/item/rogueweapon/mace/goden/steel if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 1) H.change_stat("intelligence", 2) @@ -213,21 +213,21 @@ backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/poison,/obj/item/reagent_containers/glass/bottle/rogue/healthpot) ADD_TRAIT(H, TRAIT_SEEPRICES, "[type]") if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) H.change_stat("strength", -1) H.change_stat("constitution", -1) H.change_stat("intelligence", 4) @@ -269,15 +269,15 @@ /obj/item/needle/blessed = 1, ) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 3) H.change_stat("constitution", -1) diff --git a/code/modules/antagonists/roguetown/villain/bandit.dm b/code/modules/antagonists/roguetown/villain/bandit.dm index ac8b96cd68..e29b9be2aa 100644 --- a/code/modules/antagonists/roguetown/villain/bandit.dm +++ b/code/modules/antagonists/roguetown/villain/bandit.dm @@ -88,13 +88,13 @@ if("Deserter") //well armored, polearm skill, shield skill. The heavy melee class. H.set_blindness(0) to_chat(H, span_warning("You were once a soldier employed under a lord, and left illegally. You're capable with armor, shields, and polearms.")) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) H.change_stat("strength", 2) H.change_stat("endurance", 1) @@ -105,7 +105,7 @@ beltl = /obj/item/rogueweapon/knife/hunting if(H.age == AGE_OLD) //old deserters are experts with polearms - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) var/helmet2choose = pickweight(list("Volfhelm" = 5, "Skullcap" = 2, "Barbute" = 1)) switch(helmet2choose) @@ -142,15 +142,15 @@ if("Poacher") //good perception, speed, bow skill, and knife skill. Also some cooking and skincrafting since they are poachers. The speedy ranged class. H.set_blindness(0) to_chat(H, span_warning("You illegally hunt within the lands of others, and are quite good at it.")) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC) H.change_stat("strength", 1) H.change_stat("endurance", 1) @@ -175,9 +175,9 @@ head = /obj/item/clothing/head/roguetown/helmet/leather/volfhelm if(H.age == AGE_OLD) //old poachers are better at their jobs - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) switch(pick(1,2,3)) if (1) @@ -190,14 +190,14 @@ if("Brigand") //good sword skill, shield skill, flail skill, mace skill, slightly speedy. Kind of an all rounder. H.set_blindness(0) to_chat(H, span_warning("You are experienced with using swords and clubs to threaten and rob others.")) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 1) @@ -241,16 +241,16 @@ H.cure_blind("TRAIT_GENERIC") // The commmon skills shared between all bandits - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) H.mind.teach_crafting_recipe(/datum/crafting_recipe/bandit_volfhelm) H.mind.teach_crafting_recipe(/datum/crafting_recipe/cult_hood) diff --git a/code/modules/antagonists/roguetown/villain/lich.dm b/code/modules/antagonists/roguetown/villain/lich.dm index 3265e944cf..2deca5595d 100644 --- a/code/modules/antagonists/roguetown/villain/lich.dm +++ b/code/modules/antagonists/roguetown/villain/lich.dm @@ -87,20 +87,20 @@ beltr = /obj/item/reagent_containers/glass/bottle/rogue/manapot beltl = /obj/item/rogueweapon/knife/hunting r_hand = /obj/item/rogueweapon/polearm/woodstaff/quarterstaff - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 5) diff --git a/code/modules/antagonists/roguetown/villain/vampirelord.dm b/code/modules/antagonists/roguetown/villain/vampirelord.dm index 16bd8a8534..de71bb5be5 100644 --- a/code/modules/antagonists/roguetown/villain/vampirelord.dm +++ b/code/modules/antagonists/roguetown/villain/vampirelord.dm @@ -155,12 +155,12 @@ GLOBAL_LIST_EMPTY(vampire_objects) /datum/outfit/job/roguetown/vamplord/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/magic/blood, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/blood, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/vampire belt = /obj/item/storage/belt/rogue/leather/plaquegold diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm index 2ec3a3786f..b9533e7a1a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/amazon.dm @@ -11,18 +11,18 @@ /datum/outfit/job/roguetown/adventurer/amazon/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) neck = /obj/item/storage/belt/rogue/pouch/amazon backl = /obj/item/rogueweapon/polearm/spear backr = /obj/item/gun/ballistic/revolver/grenadelauncher/bow diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm index 5ae5687b25..6ae2d54900 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/barbarian.dm @@ -17,19 +17,19 @@ /datum/outfit/job/roguetown/adventurer/barbarian/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //funger reference - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //funger reference + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/self/barbrage) belt = /obj/item/storage/belt/rogue/leather shoes = /obj/item/clothing/shoes/roguetown/boots/leather @@ -52,13 +52,13 @@ switch(weapontype) if("Sword") beltr = /obj/item/rogueweapon/sword/iron - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) if("Club") beltr = /obj/item/rogueweapon/mace/woodclub - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) if("Axe") beltr = /obj/item/rogueweapon/axe/iron - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_NOSTINK, TRAIT_GENERIC) if(H.dna?.species) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm index 3b85d9d7e5..f47d86e008 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/cleric.dm @@ -70,18 +70,18 @@ if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm index 2f36b9a205..5fd84bb23d 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dbomb.dm @@ -18,17 +18,17 @@ beltl = /obj/item/rogueweapon/pick beltr = /obj/item/rogueweapon/hammer backpack_contents = list(/obj/item/bomb = 1, /obj/item/flint = 1) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 1) switch(pick(1,2)) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm index 835f5d0918..e30cdef09c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/bladesinger.dm @@ -16,15 +16,15 @@ /datum/outfit/job/roguetown/adventurer/bladesinger/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) // Same stat spread as lancer/swordmaster, but gets a small bonus to speed instead of a malus, at the cost of getting no constitution bonus H.change_stat("endurance", 2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm index fea63c2573..2dadc8d3d9 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/hoplite.dm @@ -13,12 +13,12 @@ /datum/outfit/job/roguetown/adventurer/hoplite/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) @@ -40,13 +40,13 @@ switch(weapontype) // We either get a spear (winged or regular), or a khopesh sword. The weapon we get is what we get our training in if("Khopesh") beltl = /obj/item/rogueweapon/sword/khopesh - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) if("Spear") backr = /obj/item/rogueweapon/polearm/spear/hoplite - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) if("WingedSpear") backr = /obj/item/rogueweapon/polearm/spear/hoplite/winged - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm index f211c09665..b2eff19bd3 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/longbeard.dm @@ -17,18 +17,18 @@ /datum/outfit/job/roguetown/adventurer/longbeard/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) // Same stat spread as lancer/swordmaster, but no -1 speed at the cost of 1 point of endurance. A very powerful dwarf indeed H.change_stat("constitution", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm index e0cbc1002f..1aa028eb29 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/paladin.dm @@ -50,16 +50,16 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif gloves = /obj/item/clothing/gloves/roguetown/chain if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) backl = /obj/item/rogueweapon/sword/long/judgement H.change_stat("strength", 2) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm index bc90006367..e8f32468fe 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/swordmaster.dm @@ -13,12 +13,12 @@ /datum/outfit/job/roguetown/adventurer/swordmaster/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm index 166d4621cc..15cb6832af 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/donator/vaquero.dm @@ -19,21 +19,21 @@ /datum/outfit/job/roguetown/adventurer/vaquero/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) // Makes sense enough for an animal tamer - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) // How did they not have this skill before?! - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) // Makes sense enough for an animal tamer + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) // How did they not have this skill before?! + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots pants = /obj/item/clothing/under/roguetown/tights/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm index a01c1ac9dc..013b3a0f28 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/dwarfranger.dm @@ -29,19 +29,19 @@ if(prob(23)) shoes = /obj/item/clothing/shoes/roguetown/boots/leather cloak = /obj/item/clothing/cloak/raincloak/brown - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) // In line with basic combat classes + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("perception", 3) H.change_stat("speed", 1) // Fast... for a dwarf ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) // Dwarf rangers are no good at dodging, but can wear heavier armor than typical rangers diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm index b7222cb185..31328e2186 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/mage.dm @@ -29,16 +29,16 @@ beltl = /obj/item/reagent_containers/glass/bottle/rogue/manapot r_hand = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) if(H.age == AGE_OLD) head = /obj/item/clothing/head/roguetown/wizhat/gen armor = /obj/item/clothing/suit/roguetown/shirt/robe/plain backl = /obj/item/storage/backpack/rogue/backpack - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("strength", -2) H.change_stat("intelligence", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm index f126441cad..97c842349a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/monk.dm @@ -31,14 +31,14 @@ backr = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, pick(1,1,2), TRUE) // Wood staff - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, pick(1,1,2), TRUE) // Wood staff + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) H.change_stat("strength", 3) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm index 59c534ac55..971e14b2cc 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/ranger.dm @@ -18,22 +18,22 @@ /datum/outfit/job/roguetown/adventurer/ranger/pre_equip(mob/living/carbon/human/H) ..() shoes = /obj/item/clothing/shoes/roguetown/boots/leather - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm index 69636f3e8a..4cb2b4ff77 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/assassin.dm @@ -19,23 +19,23 @@ /datum/outfit/job/roguetown/adventurer/assassin/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Used for leaving notes after your evil work. + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 5) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Used for leaving notes after your evil work. var/datum/antagonist/new_antag = new /datum/antagonist/assassin() // Adds the assassin antag label. H.ambushable = FALSE H.mind.add_antag_datum(new_antag) @@ -47,7 +47,7 @@ switch(disguisechoice) if("Bard") - H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) //Have to know to "PLAY" the part... Eh? Eh? + H.mind?.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) //Have to know to "PLAY" the part... Eh? Eh? head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots pants = /obj/item/clothing/under/roguetown/tights/random @@ -77,7 +77,7 @@ pants = /obj/item/clothing/under/roguetown/tights/vagrant shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant if("Fisher") - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) //Have to know to play the part. + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) //Have to know to play the part. if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random @@ -105,8 +105,8 @@ beltl = /obj/item/flint backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1, /obj/item/natural/worms = 1, /obj/item/rogueweapon/shovel/small = 1) if("Hunter") - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //The assassin trades their crossbow abilities to match their disguise. - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, -2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) //The assassin trades their crossbow abilities to match their disguise. + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, -2, TRUE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random shoes = /obj/item/clothing/shoes/roguetown/boots/leather @@ -120,9 +120,9 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/bait = 1, /obj/item/rogueweapon/knife/hunting = 1) gloves = /obj/item/clothing/gloves/roguetown/leather if("Miner") - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the pickaxe... - H?.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the pickaxe... + H.mind?.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) head = /obj/item/clothing/head/roguetown/armingcap pants = /obj/item/clothing/under/roguetown/trou armor = /obj/item/clothing/suit/roguetown/armor/gambeson/light/striped @@ -149,7 +149,7 @@ belt = /obj/item/storage/belt/rogue/leather/assassin id = /obj/item/clothing/ring/silver if(H.gender == MALE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) //The male noble's sword is less useful than the female noble's bow, so no downside. + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) //The male noble's sword is less useful than the female noble's bow, so no downside. pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/tunic/random cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -159,8 +159,8 @@ beltl = /obj/item/quiver/arrows backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) else - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) //Female nobles get the male noble's bow, but are less trained than an Assassin disguising as a Hunter. Balance. - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, -1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) //Female nobles get the male noble's bow, but are less trained than an Assassin disguising as a Hunter. Balance. + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, -1, TRUE) shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/random head = /obj/item/clothing/head/roguetown/hatfur cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -169,7 +169,7 @@ beltl = /obj/item/quiver/arrows backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) if("Peasant") - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/assassin shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random pants = /obj/item/clothing/under/roguetown/trou @@ -191,8 +191,8 @@ pants = null backpack_contents = list(/obj/item/neuFarm/seed/wheat=1,/obj/item/neuFarm/seed/apple=1,/obj/item/ash=1,/obj/item/rogueweapon/knife/villager=1) if("Woodcutter") - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the axe... - H?.mind.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) //Use the axe... + H.mind?.adjust_skillrank(/datum/skill/combat/swords, -2, TRUE) belt = /obj/item/storage/belt/rogue/leather/assassin shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm index 7660647f59..c145151a32 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/freelancer.dm @@ -14,12 +14,12 @@ /datum/outfit/job/roguetown/adventurer/lancer/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 2) H.change_stat("constitution", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm index 7851926bb9..064b1251c3 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelt.dm @@ -26,18 +26,18 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif beltl = /obj/item/rogueweapon/sword/long if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm index 6bae412ad0..b4fa1e75f0 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/heartfelthand.dm @@ -26,16 +26,16 @@ mask = /obj/item/clothing/mask/rogue/spectacles/golden neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 3) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm index 2f71d73b2c..fc36c83558 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/qatil.dm @@ -20,20 +20,20 @@ /datum/outfit/job/roguetown/adventurer/qatil/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) H.change_stat("strength", 1) H.change_stat("speed", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm index c09772e05c..13e385e58b 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/sentinel.dm @@ -26,16 +26,16 @@ /datum/outfit/job/roguetown/adventurer/sentinel/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm index eeba2e77c8..1780f32cfe 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/swashbuckler.dm @@ -31,18 +31,18 @@ /datum/outfit/job/roguetown/adventurer/swashbuckler/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm index d57452ee47..b6f5df7565 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/treasurehunter.dm @@ -35,19 +35,19 @@ head = /obj/item/clothing/head/roguetown/helmet/leather/inquisitor neck = /obj/item/storage/belt/rogue/pouch if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 2) H.change_stat("intelligence", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm index 3087b22a29..1fc52b5f47 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rare/witchhunter.dm @@ -32,19 +32,19 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("strength", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm index a6b795d728..dc6d3ff6b8 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/rogue.dm @@ -18,22 +18,22 @@ /datum/outfit/job/roguetown/adventurer/rogue/pre_equip(mob/living/carbon/human/H) ..() shoes = /obj/item/clothing/shoes/roguetown/boots - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, pick(0,0,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, pick(0,0,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) pants = /obj/item/clothing/under/roguetown/trou/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black gloves = /obj/item/clothing/gloves/roguetown/leather diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm index 20a41d2ef3..8fad560ede 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/sorceress.dm @@ -25,13 +25,13 @@ beltl = /obj/item/reagent_containers/glass/bottle/rogue/manapot r_hand = /obj/item/rogueweapon/polearm/woodstaff if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 3) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm index 70dd911f98..8813e21f04 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/combat/warrior.dm @@ -19,20 +19,20 @@ /datum/outfit/job/roguetown/adventurer/sfighter/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, pick(0,1,1), TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" @@ -61,19 +61,19 @@ switch(weapontype) // We get +1 weapon skill in either axes/maces, swords, or flails depending on our starting weapon if("Axe") beltl = /obj/item/rogueweapon/axe/iron - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) if("Mace") beltl = /obj/item/rogueweapon/mace - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) if("Messer") beltl = /obj/item/rogueweapon/sword/scimitar/messer - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) if("Sword") beltl = /obj/item/rogueweapon/sword/iron - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) if("Flail") // Big roller gets one of the best weapons to pair with a shield, even if it is only iron tier. Lucky bastard beltl = /obj/item/rogueweapon/flail - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) if(prob(66)) neck = /obj/item/clothing/neck/roguetown/gorget diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm index 60c7dda350..2810982382 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/bard.dm @@ -20,20 +20,20 @@ /datum/outfit/job/roguetown/adventurer/bard/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/mockery) head = /obj/item/clothing/head/roguetown/bardhat shoes = /obj/item/clothing/shoes/roguetown/boots diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm index 2f4797f1f4..5930475827 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/blacksmith.dm @@ -31,26 +31,26 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueore/coal=1, /obj/item/rogueore/iron=1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,0,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,1,2), TRUE) // For the bin - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, pick(0,0,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,1,2), TRUE) // For the bin + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) if(prob(50)) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm index 0b49132cff..62da235e59 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/briar.dm @@ -31,23 +31,23 @@ if(H.patron != /datum/patron/divine/dendor) H.patron = GLOB.patronlist[/datum/patron/divine/dendor] - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) // the unique Dendor crafting recipes. Dendor shrines (pantheon cross) and alt cosmetic helmet H.mind.teach_crafting_recipe(/datum/crafting_recipe/dendor/visage) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm index 21d600a311..68f68f4ece 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/carpenter.dm @@ -19,17 +19,17 @@ /datum/outfit/job/roguetown/adventurer/carpenter/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) head = /obj/item/clothing/head/roguetown/hatfur if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm index f51ae50123..59ec67d56b 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/cheesemaker.dm @@ -18,15 +18,15 @@ /datum/outfit/job/roguetown/adventurer/cheesemaker/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm index 7e6f555f9d..cd304344ee 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/fisher.dm @@ -18,16 +18,16 @@ /datum/outfit/job/roguetown/adventurer/fisher/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) H.change_stat("constitution", 1) H.change_stat("perception", 1) else diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm index 6d986ff321..d0bd44bdc0 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/hunter.dm @@ -32,25 +32,25 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/bait = 1, /obj/item/rogueweapon/knife/hunting = 1, /obj/item/flashlight/flare/torch/lantern = 1) gloves = /obj/item/clothing/gloves/roguetown/leather if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) else diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm index 145316e8e5..132d0ccf5c 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/miner.dm @@ -29,19 +29,19 @@ backl = /obj/item/storage/backpack/rogue/backpack backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/knife/villager = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm index fdb0f70184..8333bc221f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/noble.dm @@ -27,13 +27,13 @@ H.real_name = "[honorary] [prev_real_name]" H.name = "[honorary] [prev_name]" - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, rand(1,2), TRUE) H.change_stat("intelligence", 1) shoes = /obj/item/clothing/shoes/roguetown/boots backl = /obj/item/storage/backpack/rogue/satchel @@ -42,8 +42,8 @@ id = /obj/item/clothing/ring/silver if(H.gender == FEMALE) H.change_stat("speed", 1) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/random head = /obj/item/clothing/head/roguetown/hatfur cloak = /obj/item/clothing/cloak/raincloak/furcloak @@ -53,8 +53,8 @@ backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/wine = 1, /obj/item/reagent_containers/glass/cup/silver = 1) if(H.gender == MALE) H.change_stat("constitution", 1) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) pants = /obj/item/clothing/under/roguetown/tights/black shirt = /obj/item/clothing/suit/roguetown/shirt/tunic/random cloak = /obj/item/clothing/cloak/raincloak/furcloak diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm index 4e0b7eb182..ceab834a3a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/peasant.dm @@ -17,18 +17,18 @@ /datum/outfit/job/roguetown/adventurer/peasant/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, rand(2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, rand(2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) belt = /obj/item/storage/belt/rogue/leather/rope shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm index e396be30be..8351d9135f 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/physicker.dm @@ -31,13 +31,13 @@ neck = /obj/item/clothing/neck/roguetown/phys r_hand = /obj/item/storage/backpack/rogue/satchel/surgbag - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) H.change_stat("intelligence", 2) H.change_stat("speed", 1) ADD_TRAIT(H, TRAIT_EMPATH, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm index bf21ca462d..0061030426 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lcarp.dm @@ -23,17 +23,17 @@ /datum/outfit/job/roguetown/adventurer/mastercarpenter/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) // They work at great heights. - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) // They work at great heights. + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) head = /obj/item/clothing/head/roguetown/hatfur armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm index 25ef4a23cb..8f9c982fbd 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lchef.dm @@ -23,16 +23,16 @@ /datum/outfit/job/roguetown/adventurer/masterchef/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 6, TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random @@ -47,7 +47,7 @@ H.change_stat("intelligence", 3) H.change_stat("constitution", 2) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) var/packcontents = pickweight(list("Honey" = 1, "Truffles" = 1, "Bacon" = 1)) // What is our special ingredient? Honey, truffles, or BACON? switch(packcontents) if("Honey") diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm index 810c205037..2b6400cffb 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lfish.dm @@ -36,19 +36,19 @@ beltl = /obj/item/rogueweapon/knife/hunting backpack_contents = list(/obj/item/natural/worms = 2,/obj/item/rogueweapon/shovel/small=1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.change_stat("constitution", 2) H.change_stat("perception", 2) else @@ -64,17 +64,17 @@ beltl = /obj/item/rogueweapon/knife/hunting backpack_contents = list(/obj/item/natural/worms = 2,/obj/item/rogueweapon/shovel/small=1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/fishing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) H.change_stat("constitution", 2) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm index beb5108c90..a3a40c1396 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lmason.dm @@ -14,20 +14,20 @@ /datum/outfit/job/roguetown/adventurer/grandmastermason/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) head = /obj/item/clothing/head/roguetown/hatblu armor = /obj/item/clothing/suit/roguetown/armor/leather/vest cloak = /obj/item/clothing/cloak/apron/waist/bar diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm index 43b3f80cdb..36c27b6886 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lminer.dm @@ -24,22 +24,22 @@ backl = /obj/item/storage/backpack/rogue/backpack if(H.age == AGE_OLD) H.change_stat("endurance", -1) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", 1) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm index 6d35c7af21..931d70e94a 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lpeasant.dm @@ -21,22 +21,22 @@ /datum/outfit/job/roguetown/adventurer/farmermaster/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 2, TRUE) belt = /obj/item/storage/belt/rogue/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/random diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm index 42c6f8a61f..9be78c5de3 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/Lsmith.dm @@ -30,34 +30,34 @@ backpack_contents = list(/obj/item/flint = 1, /obj/item/rogueweapon/tongs=1, /obj/item/rogueore/coal=1, /obj/item/rogueore/iron=1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,2,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, pick(0,1,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(0,1,1), TRUE) // 66% over 50% of normal smith - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, pick(1,2,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, pick(1,2,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, pick(0,1,1), TRUE) // 66% over 50% of normal smith + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, pick(1,2,2), TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) // Wise still on every field, but gimped stats from age. H.change_stat("endurance", -1) H.change_stat("constitution", -1) H.change_stat("speed", -1) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) else // The actual stats H.change_stat("strength", 1) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm index 12ccfe89af..c4e08bf158 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/grenzelhoft.dm @@ -34,18 +34,18 @@ armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress/alt beltl = /obj/item/rogueweapon/sword/rapier/dec if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) var/prev_real_name = H.real_name var/prev_name = H.name var/honorary = "Count" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm index dca2523d12..96bd197cba 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/merchant.dm @@ -18,14 +18,14 @@ /datum/outfit/job/roguetown/adventurer/merchant/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tailor, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tailor, 1, TRUE) H.change_stat("intelligence", 2) H.change_stat("speed", 1) shoes = /obj/item/clothing/shoes/roguetown/boots @@ -50,15 +50,15 @@ switch(merchtype) if("FOOD") // Travelling food peddler backpack_contents = list(/obj/item/reagent_containers/food/snacks/rogue/meat/salami = 1, /obj/item/reagent_containers/food/snacks/rogue/meat/coppiette = 1, /obj/item/reagent_containers/food/snacks/rogue/cheddar = 1, /obj/item/reagent_containers/food/snacks/rogue/saltfish = 1, /obj/item/reagent_containers/food/snacks/rogue/crackerscooked = 1) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) if("HEAL") // Travelling potion seller (If only we had snake oil..) backpack_contents = list(/obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/healthpot, /obj/item/reagent_containers/glass/bottle/rogue/manapot) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 2, TRUE) if("SILK") // Travelling silk trader backpack_contents = list(/obj/item/natural/bundle/silk = 2, /obj/item/natural/fur = 1, /obj/item/natural/bundle/fibers = 2, /obj/item/clothing/suit/roguetown/shirt/dress/silkdress, /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) if("GEMS") // Travelling high-end merchant backpack_contents = list(/obj/item/roguegem/yellow, /obj/item/roguegem/yellow, /obj/item/roguegem/green, /obj/item/roguegem/green, /obj/item/roguegem/violet) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 1, TRUE) ADD_TRAIT(H, TRAIT_NOBLE, TRAIT_GENERIC) ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm index 3d529eff43..bd8764466b 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/preacher.dm @@ -26,10 +26,10 @@ r_hand = /obj/item/book/rogue/psybibble beltl = /obj/item/handheld_bell if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) if(!H.has_language(/datum/language/oldpsydonic)) H.grant_language(/datum/language/oldpsydonic) to_chat(H, "I can speak Old Psydonic with ,m before my speech.") diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm index cc7986f32f..c703f25c08 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/rare/zybantine.dm @@ -39,18 +39,18 @@ // armor = /obj/item/clothing/suit/roguetown/armor/leather/jacket/silk_coat shirt = /obj/item/clothing/suit/roguetown/shirt/dress/silkdress/black if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) var/prev_real_name = H.real_name var/prev_name = H.name var/honorary = "Emir" diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm index dd7bb84b70..7a416166a3 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/weaver.dm @@ -13,15 +13,15 @@ /datum/outfit/job/roguetown/adventurer/seamstress/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/cloth/lady pants = /obj/item/clothing/under/roguetown/tights/random shoes = /obj/item/clothing/shoes/roguetown/shortboots diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm index 4d84dd3118..0a14e71112 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/pilgrim/woodcutter.dm @@ -15,17 +15,17 @@ /datum/outfit/job/roguetown/adventurer/woodcutter/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, pick(3,3,4), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm index 4bf0ea10f1..0f72bb0190 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/special/crusader.dm @@ -72,19 +72,19 @@ cloak = /obj/item/clothing/cloak/stabard/crusader // Gold version regardless of gender or patron wrists = /obj/item/clothing/neck/roguetown/psycross/silver - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) H.change_stat("endurance", 2) H.change_stat("constitution", 2) H.change_stat("strength", 1) @@ -97,12 +97,12 @@ backr = /obj/item/gun/ballistic/revolver/grenadelauncher/crossbow beltl = /obj/item/rogueweapon/knife/dagger/silver beltr = /obj/item/quiver/bolts - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) // Males are sword and shield based else - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 1, TRUE) // Finally, grant us the language if(!H.has_language(/datum/language/oldpsydonic)) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm b/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm index bf70c2ee72..c992d78ecb 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/types/special/whitecheesemaker.dm @@ -15,25 +15,25 @@ /datum/outfit/job/roguetown/adventurer/whitecheese/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, rand(4,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, rand(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, rand(4,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, rand(1,2), TRUE) belt = /obj/item/storage/belt/rogue/leather pants = /obj/item/clothing/under/roguetown/tights/black diff --git a/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm b/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm index fc54e566a2..d2bfcfb77f 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/bapprentice.dm @@ -20,16 +20,16 @@ /datum/outfit/job/roguetown/bapprentice/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shoes = /obj/item/clothing/shoes/roguetown/simpleshoes diff --git a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm b/code/modules/jobs/job_types/roguetown/apprentices/prince.dm index 3b06f5b04c..b0b1884563 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/prince.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/prince.dm @@ -39,15 +39,15 @@ beltr = /obj/item/storage/belt/rogue/pouch/coins/rich backr = /obj/item/storage/backpack/rogue/satchel if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) H.change_stat("constitution", 1) @@ -64,14 +64,14 @@ beltl = /obj/item/roguekey/manor backr = /obj/item/storage/backpack/rogue/satchel if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) H.change_stat("perception", 1) H.change_stat("endurance", -1) H.change_stat("strength", -1) diff --git a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm b/code/modules/jobs/job_types/roguetown/apprentices/servant.dm index 9b769a06b3..a31e909748 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/servant.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/servant.dm @@ -29,17 +29,17 @@ ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, pick(0,1,1), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt diff --git a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm index 08e2d24d7d..be0a91e55f 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/squire.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/squire.dm @@ -50,17 +50,17 @@ H.change_stat("constitution", 1) H.change_stat("speed", 1) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.gender == MALE && H.dna?.species) H.dna.species.soundpack_m = new /datum/voicepack/male/squire() diff --git a/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm b/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm index 02ccaf04d7..5eb25832c0 100644 --- a/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm +++ b/code/modules/jobs/job_types/roguetown/apprentices/wapprentice.dm @@ -21,14 +21,14 @@ /datum/outfit/job/roguetown/wapprentice/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/projectile/fetch) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random diff --git a/code/modules/jobs/job_types/roguetown/church/adept.dm b/code/modules/jobs/job_types/roguetown/church/adept.dm index 9c3c443336..fbf21310f5 100644 --- a/code/modules/jobs/job_types/roguetown/church/adept.dm +++ b/code/modules/jobs/job_types/roguetown/church/adept.dm @@ -56,18 +56,18 @@ backpack_contents = list(/obj/item/keyring/shepherd = 1, /obj/item/rogueweapon/knife/dagger/silver = 1) //Stats for class - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", -2) H.change_stat("endurance", 1) @@ -98,21 +98,21 @@ backpack_contents = list(/obj/item/lockpick = 1, /obj/item/keyring/shepherd = 1, /obj/item/rogueweapon/knife/dagger/silver = 1) //Stats for class - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/firearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) H.change_stat("strength", -1) H.change_stat("perception", 2) H.change_stat("speed", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/inquisitor.dm b/code/modules/jobs/job_types/roguetown/church/inquisitor.dm index 4b5bdfdc3c..3f1dc880d2 100644 --- a/code/modules/jobs/job_types/roguetown/church/inquisitor.dm +++ b/code/modules/jobs/job_types/roguetown/church/inquisitor.dm @@ -60,20 +60,20 @@ H.purchase_history = list() // Initialize as an empty list to track purchases if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/firearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) H.change_stat("intelligence", 2) H.change_stat("strength", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/monk.dm b/code/modules/jobs/job_types/roguetown/church/monk.dm index 7c6b63142a..c8ad00a0e2 100644 --- a/code/modules/jobs/job_types/roguetown/church/monk.dm +++ b/code/modules/jobs/job_types/roguetown/church/monk.dm @@ -75,17 +75,17 @@ if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) // They get this and a wooden staff to defend themselves - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) // They get this and a wooden staff to defend themselves + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("endurance", 2) // For casting lots of spells, and working long hours without sleep at the church H.change_stat("perception", -1) diff --git a/code/modules/jobs/job_types/roguetown/church/priest.dm b/code/modules/jobs/job_types/roguetown/church/priest.dm index fa41e27172..3ceaf6daf4 100644 --- a/code/modules/jobs/job_types/roguetown/church/priest.dm +++ b/code/modules/jobs/job_types/roguetown/church/priest.dm @@ -56,19 +56,19 @@ if(H.patron != /datum/patron/divine/dendor) // Astratans rule the church H.patron = GLOB.patronlist[/datum/patron/divine/astrata] - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) // Privilege of being the SECOND biggest target in the game, and arguably the worse of the two targets to lose - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) // Privilege of being the SECOND biggest target in the game, and arguably the worse of the two targets to lose + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 1, TRUE) H.change_stat("strength", 1) // One slot and a VERY important role, it deserves a half-decent statline H.change_stat("intelligence", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/church/templar.dm b/code/modules/jobs/job_types/roguetown/church/templar.dm index 694731d564..4936adfd69 100644 --- a/code/modules/jobs/job_types/roguetown/church/templar.dm +++ b/code/modules/jobs/job_types/roguetown/church/templar.dm @@ -67,15 +67,15 @@ id = /obj/item/clothing/ring/silver gloves = /obj/item/clothing/gloves/roguetown/chain if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/holy, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", 2) H.change_stat("constitution", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm index d14ec99f4a..3dfab617f2 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/dungeoneer.dm @@ -41,17 +41,17 @@ backr = /obj/item/storage/backpack/rogue/satchel // lack of satchel requires dealing with the merchant to correct, which requires entering town; not ideal. N. if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Allow reading notes passed to the literate noble prisoner, or writing reports. N. See peasants\prisoner.dm. - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // Allow reading notes passed to the literate noble prisoner, or writing reports. N. See peasants\prisoner.dm. + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) H.change_stat("strength", 2) H.change_stat("intelligence", -2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm b/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm index 1bc3f44c1b..336b317e5b 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/garrisonarcher.dm @@ -50,19 +50,19 @@ head = /obj/item/clothing/head/roguetown/roguehood/red if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // For rapier use - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // For rapier use + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) H.change_stat("intelligence", 1) H.change_stat("perception", 2) H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm b/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm index 38de28eaca..b61774f2ef 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/garrisonguard.dm @@ -80,16 +80,16 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 1) H.change_stat("endurance", 2) H.change_stat("constitution", 1) @@ -115,15 +115,15 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("strength", 2) H.change_stat("endurance", 1) H.change_stat("constitution", 1) @@ -160,20 +160,20 @@ Design philosphy: backpack_contents = list(/obj/item/keyring/guard) //Stats for class - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("perception", 2) H.change_stat("endurance", 1) H.change_stat("speed", 2) @@ -199,14 +199,14 @@ Design philosphy: neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/keyring/guard) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.change_stat("endurance", 2) H.change_stat("speed", 2) ADD_TRAIT(H, TRAIT_DODGEEXPERT, TRAIT_GENERIC) diff --git a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm b/code/modules/jobs/job_types/roguetown/garrison/mayor.dm index dadbed6899..fd8b9f16ac 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/mayor.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/mayor.dm @@ -43,21 +43,21 @@ beltl = /obj/item/flashlight/flare/torch/lantern r_hand = /obj/item/rogueweapon/polearm/woodstaff/quarterstaff if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 1, TRUE) H.change_stat("strength", 1) H.change_stat("perception", 1) H.change_stat("intelligence", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm index 8d5de79534..e381b50c96 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/royalguard.dm @@ -68,19 +68,19 @@ head = /obj/item/clothing/head/roguetown/helmet/sallet if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) H.change_stat("strength", 2) H.change_stat("perception", 2) H.change_stat("endurance", 2) diff --git a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm index 79ccd51ee1..45fdfe1878 100644 --- a/code/modules/jobs/job_types/roguetown/garrison/veteran.dm +++ b/code/modules/jobs/job_types/roguetown/garrison/veteran.dm @@ -44,21 +44,21 @@ backl = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel/special = 1, /obj/item/signal_horn = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) H.change_stat("strength", 3) H.change_stat("perception", 1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm index 28f8c0c7c7..a3f00b2a05 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/archivist.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/archivist.dm @@ -52,12 +52,12 @@ H.grant_language(/datum/language/celestial) H.grant_language(/datum/language/hellspeak) H.grant_language(/datum/language/oldpsydonic) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 2, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 8) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/captain.dm b/code/modules/jobs/job_types/roguetown/nobility/captain.dm index bf8f61efb7..403aa97015 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/captain.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/captain.dm @@ -52,21 +52,21 @@ cloak = /obj/item/clothing/cloak/cape/guard backpack_contents = list(/obj/item/keyring/captain = 1, /obj/item/signal_horn = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) H.change_stat("strength", 3) H.change_stat("perception", 2) H.change_stat("intelligence", 1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm index 0128c7c116..29bb0d35d3 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/feldsher.dm @@ -43,15 +43,15 @@ beltl = /obj/item/keyring/doctor if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) H.change_stat("strength", -1) H.change_stat("intelligence", 4) H.change_stat("constitution", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/hand.dm b/code/modules/jobs/job_types/roguetown/nobility/hand.dm index e38c1fa018..527f68febd 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/hand.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/hand.dm @@ -44,20 +44,20 @@ backr = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/dagger/steel = 1, /obj/item/keyring/hand = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) H.change_stat("strength", 1) H.change_stat("constitution", 1) H.change_stat("perception", 2) diff --git a/code/modules/jobs/job_types/roguetown/nobility/lady.dm b/code/modules/jobs/job_types/roguetown/nobility/lady.dm index 50e0a59b91..121d8d771c 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lady.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lady.dm @@ -41,13 +41,13 @@ armor = /obj/item/clothing/suit/roguetown/armor/gambeson/heavy/dress/alt l_hand = /obj/item/rogueweapon/lordscepter if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) H.change_stat("speed", 2) @@ -58,13 +58,13 @@ id = /obj/item/clothing/ring/silver shoes = /obj/item/clothing/shoes/roguetown/shortboots if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - 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, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) /datum/job/roguetown/lady/after_spawn(mob/living/L, mob/M, latejoin = TRUE) ..() diff --git a/code/modules/jobs/job_types/roguetown/nobility/lord.dm b/code/modules/jobs/job_types/roguetown/nobility/lord.dm index c16ac2c9ee..87a4b6fb2f 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/lord.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/lord.dm @@ -45,20 +45,20 @@ id = /obj/item/clothing/ring/active/nomag l_hand = /obj/item/rogueweapon/lordscepter if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 1, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", 3) H.change_stat("endurance", 3) diff --git a/code/modules/jobs/job_types/roguetown/nobility/magician.dm b/code/modules/jobs/job_types/roguetown/nobility/magician.dm index a79ab57666..a915147afb 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/magician.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/magician.dm @@ -39,13 +39,13 @@ shoes = /obj/item/clothing/shoes/roguetown/shortboots backpack_contents = list(/obj/item/scrying = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, pick(6,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, pick(6,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, 3, TRUE) if(H.age == AGE_OLD) armor = /obj/item/clothing/suit/roguetown/shirt/robe/courtmage H.change_stat("speed", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm index 9181db8560..d0ebe40e5b 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/merchant.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/merchant.dm @@ -55,11 +55,11 @@ H.change_stat("strength", -1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mathematics, 4, TRUE) // Literally unused skill - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mathematics, 4, TRUE) // Literally unused skill + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm index a20ff57069..a1f1df4c14 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/nightman.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/nightman.dm @@ -36,13 +36,13 @@ 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/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + 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/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -1) diff --git a/code/modules/jobs/job_types/roguetown/nobility/steward.dm b/code/modules/jobs/job_types/roguetown/nobility/steward.dm index 420ac7c12e..2181983fec 100644 --- a/code/modules/jobs/job_types/roguetown/nobility/steward.dm +++ b/code/modules/jobs/job_types/roguetown/nobility/steward.dm @@ -41,12 +41,12 @@ backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/rich = 1, /obj/item/lockpickring/mundane = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 6, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 6, TRUE) H.change_stat("strength", -2) H.change_stat("intelligence", 8) H.change_stat("constitution", -2) diff --git a/code/modules/jobs/job_types/roguetown/other/deathknight.dm b/code/modules/jobs/job_types/roguetown/other/deathknight.dm index 7370adb810..690e22a205 100644 --- a/code/modules/jobs/job_types/roguetown/other/deathknight.dm +++ b/code/modules/jobs/job_types/roguetown/other/deathknight.dm @@ -82,14 +82,14 @@ /datum/outfit/job/roguetown/deathknight/pre_equip(mob/living/carbon/human/H) ..() - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/magic/arcane, 3, TRUE) belt = /obj/item/storage/belt/rogue/leather diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm index 7be9a50836..6bef1cee89 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/anthrax.dm @@ -17,15 +17,15 @@ backl = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/roguekey/mercenary, /obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/dagger/steel/dirk) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - 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/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + 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/riding, 3, TRUE) ADD_TRAIT(H, TRAIT_STEELHEARTED, TRAIT_GENERIC) H.verbs |= /mob/living/carbon/human/proc/torture_victim //Secret police training owing to their origins. @@ -39,9 +39,9 @@ backr = /obj/item/rogueweapon/shield/tower/spidershield beltr = /obj/item/rogueweapon/whip/spiderwhip - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 3, TRUE) H.change_stat("strength", 2) //Grenz merc statline but with maluses. H.change_stat("constitution", 1) @@ -62,17 +62,17 @@ beltr = /obj/item/quiver/arrows beltl = /obj/item/rogueweapon/sword/sabre/stalker - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) //Spread-out support skills, but inferior to Steppesman/Boltslinger. - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) //Spread-out support skills, but inferior to Steppesman/Boltslinger. + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 3, TRUE) H.change_stat("speed", 2) //Speedier than a Steppesman, but not as tough or damaging. H.change_stat("endurance", 1) diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm index c528b94826..9465b990a9 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/blackoak.dm @@ -26,16 +26,16 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) H.merctype = 4 diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm index c5d91affc6..0472eca1e8 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/boltslinger.dm @@ -33,22 +33,22 @@ neck = /obj/item/clothing/neck/roguetown/chaincoif backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor, /obj/item/rogueweapon/knife/hunting) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.merctype = 6 diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm index 6caf23a916..6a6d9422d7 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/grenzelhoft.dm @@ -15,18 +15,18 @@ /datum/outfit/job/roguetown/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) //Big sword user so - really helps them. - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE) // Equal chance between skilled and average, can use a cudgel to beat less dangerous targets into submission - H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) //Big sword user so - really helps them. + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, pick(2,3), TRUE) // Equal chance between skilled and average, can use a cudgel to beat less dangerous targets into submission + H.mind?.adjust_skillrank(/datum/skill/combat/shields, pick(0,0,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) if(H.gender == FEMALE) H.underwear = "Femleotard" diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm index 6e81d261ec..1220b0c35f 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/steppesman.dm @@ -31,22 +31,22 @@ backr = /obj/item/storage/backpack/rogue/satchel backpack_contents = list(/obj/item/rogueweapon/knife/hunting = 1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("perception", 1) H.change_stat("constitution", 1) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm index 204699c535..ac511699ec 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/underdweller.dm @@ -22,32 +22,32 @@ backl = /obj/item/storage/backpack/rogue/backpack backpack_contents = list(/obj/item/storage/belt/rogue/pouch/coins/poor=1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("fortune", 1) H.change_stat("endurance", 1) H.change_stat("strength", 1) if(H.dna.species.id == "dwarf") H.cmode_music = 'sound/music/combat_dwarf.ogg' - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) head = /obj/item/clothing/head/roguetown/helmet/leather/minershelm beltl = /obj/item/rogueweapon/pick/paxe // Dorfs get a pick as their primary weapon and axes/maces to use it backr = /obj/item/rogueweapon/shield/wood else // No miner's helm for Delves as they haven nitevision now. - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) beltl = /obj/item/rogueweapon/sword/sabre // Dark elves get a sabre as their primary weapon and swords skill, who woulda thought diff --git a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm index a6bfce1f8d..ead5987bce 100644 --- a/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm +++ b/code/modules/jobs/job_types/roguetown/other/merc_classes/zybantine.dm @@ -35,20 +35,20 @@ H.grant_language(/datum/language/zybantine) to_chat(H, "I can speak Zybean with ,z before my speech.") if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, pick(0,1,1), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, pick(0,1,1), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.merctype = 1 diff --git a/code/modules/jobs/job_types/roguetown/other/tester.dm b/code/modules/jobs/job_types/roguetown/other/tester.dm index 65c5c1e583..bd0ae3c587 100644 --- a/code/modules/jobs/job_types/roguetown/other/tester.dm +++ b/code/modules/jobs/job_types/roguetown/other/tester.dm @@ -45,17 +45,17 @@ pants = /obj/item/clothing/under/roguetown/tights/black beltr = /obj/item/rogueweapon/sword/sabre if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/bows, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, rand(1,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/bows, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/crossbows, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, rand(1,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, rand(1,5), TRUE) H.change_stat("strength", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm index f0a527fc27..9214dd7839 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/bathmaid.dm @@ -29,16 +29,16 @@ ADD_TRAIT(H, TRAIT_GOODLOVER, TRAIT_GENERIC) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) // To wrestle people out of the baths - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick(1,1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) // To wrestle people out of the baths + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, pick(1,1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) if(H.gender == MALE) shoes = /obj/item/clothing/shoes/roguetown/boots/leather shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/puritan diff --git a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm index d5bb75bbd6..92c62677ec 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/beggar.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/beggar.dm @@ -54,12 +54,12 @@ if(prob(50)) shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/vagrant/l if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,2,3,4,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, pick (1,2,3,4,5), TRUE) // thug lyfe - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(2,3,4,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, pick(1,2,3), TRUE) // Street-fu - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, pick(1,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, pick(1,2,3,4,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, pick(1,2,3,4,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, pick (1,2,3,4,5), TRUE) // thug lyfe + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, pick(2,3,4,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, pick(1,2,3), TRUE) // Street-fu + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, pick(1,2,3), TRUE) H.STALUC = rand(1, 20) if(prob(5)) r_hand = /obj/item/rogueweapon/mace/woodclub diff --git a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm index 13b08df1b1..23e91e13fe 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/butcher.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/butcher.dm @@ -48,14 +48,14 @@ H.change_stat("intelligence", -1) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) // Not a trained cook, but knows a thing or two - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) // Better than a soilson, but doesn't outshine a hunter or a weaver - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 2, TRUE) // Not a trained cook, but knows a thing or two + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, 2, TRUE) // Better than a soilson, but doesn't outshine a hunter or a weaver + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 5, TRUE) diff --git a/code/modules/jobs/job_types/roguetown/peasants/butler.dm b/code/modules/jobs/job_types/roguetown/peasants/butler.dm index c7812e6499..9c8dfdd2d9 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/butler.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/butler.dm @@ -26,18 +26,18 @@ backpack_contents = list(/obj/item/book/rogue/manners = 1) mask = /obj/item/clothing/mask/rogue/spectacles if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) // A well educated head of servants should at least have skilled literacy level - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,1,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // Privilege of living a life raising nobility. Knows the very basics about riding a mount + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) // A well educated head of servants should at least have skilled literacy level + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, pick(1,1,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // Privilege of living a life raising nobility. Knows the very basics about riding a mount H.change_stat("strength", -1) H.change_stat("intelligence", 2) H.change_stat("perception", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/cook.dm b/code/modules/jobs/job_types/roguetown/peasants/cook.dm index 9c5d2ed8fa..8d06dcb3a2 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/cook.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/cook.dm @@ -26,16 +26,16 @@ /datum/outfit/job/roguetown/cook/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/butchering, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/butchering, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 1, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) belt = /obj/item/storage/belt/rogue/leather/rope beltl = /obj/item/roguekey/tavern beltr = /obj/item/rogueweapon/knife/villager diff --git a/code/modules/jobs/job_types/roguetown/peasants/grabber.dm b/code/modules/jobs/job_types/roguetown/peasants/grabber.dm index 726f3448b4..dcd21fb3af 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/grabber.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/grabber.dm @@ -29,14 +29,14 @@ /datum/outfit/job/roguetown/grabber/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) // You get a cudgel for nonlethal self defense and that's it. - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)//they can use the merchant machine and that's it - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) // You get a cudgel for nonlethal self defense and that's it. + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE)//they can use the merchant machine and that's it + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) H.change_stat("strength", 1) if(H.gender == MALE) shoes = /obj/item/clothing/shoes/roguetown/boots/leather diff --git a/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm b/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm index 64ff1b3dc3..47a3f40bdb 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/gravedigger.dm @@ -38,13 +38,13 @@ else armor = /obj/item/clothing/suit/roguetown/armor/leather/vest/black if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.change_stat("strength", 1) H.change_stat("intelligence", -2) H.change_stat("speed", 1) diff --git a/code/modules/jobs/job_types/roguetown/peasants/jester.dm b/code/modules/jobs/job_types/roguetown/peasants/jester.dm index 74b303071e..284a34429f 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/jester.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/jester.dm @@ -39,14 +39,14 @@ head = /obj/item/clothing/head/roguetown/jester neck = /obj/item/clothing/neck/roguetown/coif if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, pick(4,4,5), TRUE) // Pirouette, but falling and hurting yourself IS pretty funny. - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/stealing, 5, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, pick(4,4,5), TRUE) // Pirouette, but falling and hurting yourself IS pretty funny. + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/music, pick(1,2), TRUE) H.mind.AddSpell(new /obj/effect/proc_holder/spell/invoked/mockery) // Mock people to your heart's content! H.STAINT = rand(1, 20) H.STALUC = rand(1, 20) diff --git a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm b/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm index d4b8ba4354..0904ada069 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/prisoner.dm @@ -37,17 +37,17 @@ H.dropItemToGround(H.wear_mask, TRUE) qdel(I) if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) // given Noble trait. N. - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // given Noble trait. N. - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) // per suggestion. N. - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) // given Noble trait it makes no sense they were illiterate. N. - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // per suggestion. N. + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) // given Noble trait. N. + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) // given Noble trait. N. + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 1, TRUE) // per suggestion. N. + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) // given Noble trait it makes no sense they were illiterate. N. + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sneaking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/riding, 1, TRUE) // per suggestion. N. H.change_stat("strength", -1) // Malnutrition. N. H.change_stat("perception", 2) // Few distractions, idle mind, focused senses. N. H.change_stat("intelligence", 2) // Given Noble trait it makes no sense they are idiots. N. diff --git a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm index 3c712a0d24..3e38a79258 100644 --- a/code/modules/jobs/job_types/roguetown/peasants/soilson.dm +++ b/code/modules/jobs/job_types/roguetown/peasants/soilson.dm @@ -30,19 +30,19 @@ /datum/outfit/job/roguetown/farmer/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // TODO! A way for them to operate submission holes without reading skill. Soilsons shouldn't be able to read. - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, pick(2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/farming, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/taming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) // TODO! A way for them to operate submission holes without reading skill. Soilsons shouldn't be able to read. + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("strength", 1) H.change_stat("constitution", 1) diff --git a/code/modules/jobs/job_types/roguetown/roguetown.dm b/code/modules/jobs/job_types/roguetown/roguetown.dm index 5e03606f1f..d94fe8f2ab 100644 --- a/code/modules/jobs/job_types/roguetown/roguetown.dm +++ b/code/modules/jobs/job_types/roguetown/roguetown.dm @@ -64,9 +64,9 @@ H.dna.species.random_underwear(H.gender) if(H.dna.species) if(H.dna.species.id == "elf") - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) if(H.dna.species.id == "dwarf") - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 1, TRUE) H.underwear_color = null H.update_body() diff --git a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm index 9116753ff5..f3348b1732 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/alchemist.dm @@ -28,11 +28,11 @@ /datum/outfit/job/roguetown/alchemist/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(2,5), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, pick(2,5), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/craft/alchemy, pick(4,6), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/alchemy, pick(4,6), TRUE) //Requires a lot of sprites, so this is just a placeholder if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou diff --git a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm index 208dc33d6f..6266a836b0 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/blacksmith.dm @@ -23,22 +23,22 @@ if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, pick(1,2), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou shoes = /obj/item/clothing/shoes/roguetown/simpleshoes/buckle @@ -87,22 +87,22 @@ if(prob(50)) head = /obj/item/clothing/head/roguetown/hatblu if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/armorsmithing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/traps, 2, TRUE) // For craftable beartraps + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) ADD_TRAIT(H, TRAIT_MALUMFIRE, TRAIT_GENERIC) if(H.age == AGE_OLD) - H?.mind.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/weaponsmithing, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/blacksmithing, pick(1,2), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/weaponsmithing, pick(1,2), TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/trou shoes = /obj/item/clothing/shoes/roguetown/boots/leather diff --git a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm index 0f23ca9e37..7ec7c49b7e 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/innkeep.dm @@ -27,12 +27,12 @@ /datum/outfit/job/roguetown/innkeep/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/cooking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 2, TRUE) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/random shirt = /obj/item/clothing/suit/roguetown/shirt/shortshirt/random diff --git a/code/modules/jobs/job_types/roguetown/serfs/mason.dm b/code/modules/jobs/job_types/roguetown/serfs/mason.dm index 19b2f63242..ffac7144ae 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/mason.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/mason.dm @@ -28,20 +28,20 @@ /datum/outfit/job/roguetown/mason/pre_equip(mob/living/carbon/human/H) ..() if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, pick(2,2,3), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/labor/mining, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, rand(1,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, rand(1,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, pick(2,2,3), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/engineering, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/lockpicking, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/swimming, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/labor/mining, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/smelting, 4, TRUE) head = /obj/item/clothing/head/roguetown/brimmed neck = /obj/item/clothing/neck/roguetown/coif diff --git a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm index 2f85c31d5a..92007a4c30 100644 --- a/code/modules/jobs/job_types/roguetown/serfs/tailor.dm +++ b/code/modules/jobs/job_types/roguetown/serfs/tailor.dm @@ -21,11 +21,11 @@ shoes = /obj/item/clothing/shoes/roguetown/nobleboot head = /obj/item/clothing/head/roguetown/courtierhat if(H.mind) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, pick(3,4), TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/tanning, pick(3,4), TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, pick(3,4), TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/tanning, pick(3,4), TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/medicine, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) ADD_TRAIT(H, TRAIT_SEEPRICES, TRAIT_GENERIC) if(H.gender == MALE) pants = /obj/item/clothing/under/roguetown/tights/red diff --git a/code/modules/mob/living/carbon/human/npc/skeleton.dm b/code/modules/mob/living/carbon/human/npc/skeleton.dm index 1286705dba..c9eca2751b 100644 --- a/code/modules/mob/living/carbon/human/npc/skeleton.dm +++ b/code/modules/mob/living/carbon/human/npc/skeleton.dm @@ -105,20 +105,20 @@ H.STAINT = 1 //light labor skills for skeleton manual labor and some warrior-adventurer skills, equipment is still bad probably - H?.mind.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/masonry, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/carpentry, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/masonry, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/craft/crafting, 1, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/sewing, 1, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) - H?.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) - H?.mind.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/polearms, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/axesmaces, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/wrestling, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/unarmed, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/athletics, 4, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/shields, 2, TRUE) + H.mind?.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) + H.mind?.adjust_skillrank(/datum/skill/misc/climbing, 2, TRUE) H.set_patron(/datum/patron/inhumen/zizo) ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC)