From 3e6fb4856db177948dd25d92b8d34422f1524882 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:04:06 -0600 Subject: [PATCH 01/10] Update grenzelhoft.dm --- .../roguetown/mercenaries/grenzelhoft.dm | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index f52f3b622b..71b8510ef6 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -20,20 +20,16 @@ shoes = /obj/item/clothing/shoes/roguetown/boots/leather wrists = /obj/item/clothing/wrists/roguetown/bracers belt = /obj/item/storage/belt/rogue/leather - armor = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk + armor = /obj/item/clothing/suit/roguetown/armor/plate + gloves = /obj/item/clothing/gloves/roguetown/angle beltr = /obj/item/storage/belt/rogue/pouch/coins/poor cloak = /obj/item/clothing/cloak/stabard/grenzelhoft - shirt = /obj/item/clothing/suit/roguetown/shirt/undershirt/black - pants = /obj/item/clothing/under/roguetown/trou/leather + shirt = /obj/item/clothing/suit/roguetown/armor/chainmail/hauberk + pants = /obj/item/clothing/under/roguetown/chainlegs/iron neck = /obj/item/clothing/neck/roguetown/gorget head = /obj/item/clothing/head/roguetown/chaperon + r_hand = /obj/item/rogueweapon/eaglebeak - //quick and gay way to do random loadouts - var/equipment = rand(1, 2) - if(equipment == 1) - r_hand = /obj/item/rogueweapon/spear/billhook - else if (equipment == 2) - r_hand = /obj/item/rogueweapon/halberd var/obj/item/flashlight/flare/torch/T = new() T.spark_act() H.put_in_hands(T,forced=TRUE) @@ -54,13 +50,13 @@ H.mind.adjust_skillrank(/datum/skill/misc/sneaking, 2, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/maces, 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/crossbows, 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/combat/unarmed, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/swords, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/polearms, 4, TRUE) H.mind.adjust_skillrank(/datum/skill/combat/whipsflails, 1, TRUE) - H.mind.adjust_skillrank(/datum/skill/combat/knives, 2, TRUE) + H.mind.adjust_skillrank(/datum/skill/combat/knives, 3, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/reading, 1, TRUE) H.mind.adjust_skillrank(/datum/skill/misc/athletics, 3, TRUE) H.change_stat("strength", 3) @@ -68,4 +64,4 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) - ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC, TRAIT_HEAVYARMOR) From 59205552fa5f4d67d720b41312c8bfb0270f593f Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:12:46 -0600 Subject: [PATCH 02/10] Update grenzelhoft.dm --- .../jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 71b8510ef6..4b2455c4f0 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -30,10 +30,6 @@ head = /obj/item/clothing/head/roguetown/chaperon r_hand = /obj/item/rogueweapon/eaglebeak - var/obj/item/flashlight/flare/torch/T = new() - T.spark_act() - H.put_in_hands(T,forced=TRUE) - if(H.gender == FEMALE) var/acceptable = list("Tomboy", "Bob", "Curly Short") if(!(H.hairstyle in acceptable)) From e87fc8e727df10292c8307d75b05a17f664cbccc Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:15:24 -0600 Subject: [PATCH 03/10] Update grenzelhoft.dm --- .../modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 4b2455c4f0..136dbdc129 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -28,7 +28,7 @@ pants = /obj/item/clothing/under/roguetown/chainlegs/iron neck = /obj/item/clothing/neck/roguetown/gorget head = /obj/item/clothing/head/roguetown/chaperon - r_hand = /obj/item/rogueweapon/eaglebeak + r_hand = /obj/item/rogueweapon/eaglebeak/lucerne if(H.gender == FEMALE) var/acceptable = list("Tomboy", "Bob", "Curly Short") From 0dd3a54cfd2e89d90c838afb9c2aadb427778493 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Fri, 14 Jun 2024 22:25:26 -0600 Subject: [PATCH 04/10] Update grenzelhoft.dm --- .../modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 136dbdc129..c7046a4528 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -60,4 +60,4 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) - ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC, TRAIT_HEAVYARMOR) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR, TRAIT_GENERIC) From bac62015bb4a4d4416c48f75a55dd04b7909a057 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sat, 15 Jun 2024 10:38:01 -0600 Subject: [PATCH 05/10] Update grenzelhoft.dm --- .../modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index c7046a4528..64e80aa122 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -60,4 +60,4 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) - ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR, TRAIT_GENERIC) + traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR) From 2f478139a0d20759ab74a46b3a519426c801f119 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:34:56 -0600 Subject: [PATCH 06/10] Update grenzelhoft.dm --- .../jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 64e80aa122..881ffde953 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -6,6 +6,7 @@ allowed_sexes = list(MALE, FEMALE) allowed_races = list("Humen", "Half-Elf") outfit = /datum/outfit/job/roguetown/mercenary/grenzelhoft + traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR) display_order = JDO_GRENZELHOFT selection_color = JCOLOR_MERCENARY faction = "Station" @@ -60,4 +61,4 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) - traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR) + From ff33da76cb6edad7d8be47cf229b4f33719a7d57 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:35:43 -0600 Subject: [PATCH 07/10] Update grenzelhoft.dm --- code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 881ffde953..412d5333e7 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -61,4 +61,3 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) - From 4d11dddb4eeebf5e38dee121f8fe502dfd7791d0 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sat, 15 Jun 2024 11:47:04 -0600 Subject: [PATCH 08/10] Update grenzelhoft.dm --- .../jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 412d5333e7..250a85a6e5 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -6,7 +6,6 @@ allowed_sexes = list(MALE, FEMALE) allowed_races = list("Humen", "Half-Elf") outfit = /datum/outfit/job/roguetown/mercenary/grenzelhoft - traits_applied = list(TRAIT_MEDIUMARMOR, TRAIT_HEAVYARMOR) display_order = JDO_GRENZELHOFT selection_color = JCOLOR_MERCENARY faction = "Station" @@ -61,3 +60,5 @@ H.change_stat("constitution", 3) H.change_stat("perception", 1) H.change_stat("speed", 1) + ADD_TRAIT(H, TRAIT_MEDIUMARMOR, TRAIT_GENERIC) + ADD_TRAIT(H, TRAIT_HEAVYARMOR, TRAIT_GENERIC) From 8955aea3e8b24906754c59bdfc5fec110708609f Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sun, 16 Jun 2024 14:47:34 -0600 Subject: [PATCH 09/10] Update grenzelhoft.dm --- code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index 250a85a6e5..ef20d03602 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -35,6 +35,7 @@ if(!(H.hairstyle in acceptable)) H.hairstyle = pick(acceptable) H.update_hair() +backpack_contents = list(/obj/item/roguekey/mercenary) //Humie grenzelhofts are always set to be, well, grenzelhoft if(ishumannorthern(H)) var/list/skin_slop = H.dna.species.get_skin_list() From 8539726a5d37a9c7f7e6aa28123aad3932c16845 Mon Sep 17 00:00:00 2001 From: AnnoyingIncantation <93495705+AnnoyingIncantation@users.noreply.github.com> Date: Sun, 16 Jun 2024 14:50:33 -0600 Subject: [PATCH 10/10] Update grenzelhoft.dm --- .../modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm index ef20d03602..28c5038bdf 100644 --- a/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm +++ b/code/modules/jobs/job_types/roguetown/mercenaries/grenzelhoft.dm @@ -35,7 +35,7 @@ if(!(H.hairstyle in acceptable)) H.hairstyle = pick(acceptable) H.update_hair() -backpack_contents = list(/obj/item/roguekey/mercenary) + backpack_contents = list(/obj/item/roguekey/mercenary) //Humie grenzelhofts are always set to be, well, grenzelhoft if(ishumannorthern(H)) var/list/skin_slop = H.dna.species.get_skin_list()