diff --git a/code/__DEFINES/roguetown.dm b/code/__DEFINES/roguetown.dm index d7a3c8dab..89c514a9b 100644 --- a/code/__DEFINES/roguetown.dm +++ b/code/__DEFINES/roguetown.dm @@ -20,6 +20,8 @@ /datum/species/halforc,\ /datum/species/kobold,\ /datum/species/goblinp,\ + /datum/species/anthromacro,\ + /datum/species/demimacro,\ ) #define RACES_RESPECTED \ @@ -101,6 +103,8 @@ /datum/species/halforc,\ /datum/species/kobold,\ /datum/species/goblinp,\ + /datum/species/anthromacro,\ + /datum/species/demimacro,\ ) // Non-dwarf non-kobold non-goblin mostly #define NON_DWARVEN_RACE_TYPES list(\ @@ -120,6 +124,8 @@ /datum/species/anthromorph,\ /datum/species/demihuman,\ /datum/species/halforc,\ + /datum/species/anthromacro,\ + /datum/species/demimacro,\ ) // Non-elf non-dwarf non-kobold non-goblin mostly #define HUMANLIKE_RACE_TYPES list(\ @@ -135,6 +141,8 @@ /datum/species/dracon,\ /datum/species/anthromorph,\ /datum/species/demihuman,\ + /datum/species/anthromacro,\ + /datum/species/demimacro,\ ) #define ALL_CLERIC_PATRONS list(/datum/patron/divine/astrata, /datum/patron/divine/noc, /datum/patron/divine/dendor, /datum/patron/divine/necra, /datum/patron/divine/pestra, /datum/patron/divine/eora) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm index 8f31a30f9..d0fde5e9b 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/adventurer.dm @@ -41,25 +41,6 @@ GLOBAL_VAR_INIT(adventurer_hugbox_duration_still, 3 MINUTES) H.advsetup = 1 H.invisibility = INVISIBILITY_MAXIMUM H.become_blind("advsetup") - if(H.dna?.species) - if(isanthrom(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() - if(isdemim(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() if(GLOB.adventurer_hugbox_duration) ///FOR SOME RETARDED FUCKING REASON THIS REFUSED TO WORK WITHOUT A FUCKING TIMER IT JUST FUCKED SHIT UP diff --git a/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm b/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm index 3c87faeee..fd8563365 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/pilgrim.dm @@ -33,26 +33,6 @@ H.advsetup = 1 H.invisibility = INVISIBILITY_MAXIMUM H.become_blind("advsetup") - if(H.dna?.species) - if(isanthrom(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() - if(isdemim(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() - 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(H, TYPE_PROC_REF(/mob/living/carbon/human, adv_hugboxing_start)), 1) diff --git a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm b/code/modules/jobs/job_types/roguetown/adventurer/villager.dm index b3ff9f1aa..5f3a1ccc5 100644 --- a/code/modules/jobs/job_types/roguetown/adventurer/villager.dm +++ b/code/modules/jobs/job_types/roguetown/adventurer/villager.dm @@ -31,25 +31,7 @@ H.advsetup = 1 H.invisibility = INVISIBILITY_MAXIMUM H.become_blind("advsetup") - if(H.dna?.species) - if(isanthrom(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() - if(isdemim(H)) - H.change_stat("strength", 8) - H.change_stat("constitution", 8) - H.change_stat("endurance", 8) - H.change_stat("speed", -8) - H.change_stat("speed", -4) - H.transform = H.transform.Scale(2.25, 2.25) - H.transform = H.transform.Translate(0, (0.25 * 16)) - H.update_transform() + /* /datum/job/roguetown/adventurer/villager/New() diff --git a/code/modules/jobs/job_types/roguetown/roguetown.dm b/code/modules/jobs/job_types/roguetown/roguetown.dm index 713b9c35e..246c36e0d 100644 --- a/code/modules/jobs/job_types/roguetown/roguetown.dm +++ b/code/modules/jobs/job_types/roguetown/roguetown.dm @@ -47,6 +47,25 @@ /datum/outfit/job/roguetown/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() + if(H.dna?.species) + if(isanthrom(H)) + H.change_stat("strength", 8) + H.change_stat("constitution", 8) + H.change_stat("endurance", 8) + H.change_stat("speed", -8) + H.change_stat("speed", -4) + H.transform = H.transform.Scale(2.25, 2.25) + H.transform = H.transform.Translate(0, (0.25 * 16)) + H.update_transform() + if(isdemim(H)) + H.change_stat("strength", 8) + H.change_stat("constitution", 8) + H.change_stat("endurance", 8) + H.change_stat("speed", -8) + H.change_stat("speed", -4) + H.transform = H.transform.Scale(2.25, 2.25) + H.transform = H.transform.Translate(0, (0.25 * 16)) + H.update_transform() var/datum/patron/old_patron = H.patron if(length(allowed_patrons) && (!old_patron || !(old_patron.type in allowed_patrons))) var/list/datum/patron/possiblegods = list()