From 0c9552a7ae2f6ef9a679406cd710d70343241506 Mon Sep 17 00:00:00 2001 From: ApolloVector <149586366+ApolloVector@users.noreply.github.com> Date: Tue, 26 May 2026 20:53:58 -0700 Subject: [PATCH 1/4] grenzel merc schism --- .../other/merc_classes/grenzelhoft.dm | 103 ------------------ .../other/merc_classes/grenzelhoftgun.dm | 59 ++++++++++ .../other/merc_classes/grenzelhofthalb.dm | 70 ++++++++++++ .../other/merc_classes/grenzelhoftzwei.dm | 61 +++++++++++ vanderlin.dme | 4 +- 5 files changed, 193 insertions(+), 104 deletions(-) delete mode 100644 code/modules/jobs/job_types/other/merc_classes/grenzelhoft.dm create mode 100644 code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm create mode 100644 code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm create mode 100644 code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoft.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoft.dm deleted file mode 100644 index 51705cd1fb0..00000000000 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhoft.dm +++ /dev/null @@ -1,103 +0,0 @@ -/datum/attribute_holder/sheet/job/grenzelhoft - raw_attribute_list = list( - STAT_CONSTITUTION = 2, - /datum/attribute/skill/misc/swimming = 20, - /datum/attribute/skill/misc/climbing = 30, - /datum/attribute/skill/misc/sneaking = 30, - /datum/attribute/skill/combat/wrestling = 20, - /datum/attribute/skill/misc/athletics = 30, - /datum/attribute/skill/combat/unarmed = 20, - /datum/attribute/skill/combat/swords = 20, - /datum/attribute/skill/combat/whipsflails = 10, - /datum/attribute/skill/combat/shields = 10, - /datum/attribute/skill/misc/reading = 10, - /datum/attribute/skill/craft/cooking = 10, - ) - -/datum/attribute_holder/sheet/job/grenzelhoft/zwei - attribute_variance = list( - /datum/attribute/skill/combat/axesmaces = list(20, 30) - ) - raw_attribute_list = list( - STAT_STRENGTH = 2, - /datum/attribute/skill/combat/swords = 10, - ) - -/datum/attribute_holder/sheet/job/grenzelhoft/halberd - attribute_variance = list( - /datum/attribute/skill/combat/axesmaces = list(20, 30) - ) - raw_attribute_list = list( - STAT_STRENGTH = 2, - /datum/attribute/skill/combat/polearms = 30, - ) - -/datum/attribute_holder/sheet/job/grenzelhoft/musket - raw_attribute_list = list( - /datum/attribute/skill/combat/firearms = 30, - /datum/attribute/skill/combat/polearms = 30, - ) - -/datum/job/advclass/mercenary/grenzelhoft - title = "Grenzelhoft Mercenary" - tutorial = "A mercenary from the Grenzelhoft Empire's Mercenary Guild. Their only care is coin, and the procurement of coin." - allowed_races = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_AASIMAR) - outfit = /datum/outfit/mercenary/grenzelhoft - - attribute_sheet = /datum/attribute_holder/sheet/job/grenzelhoft - - traits = list(TRAIT_MEDIUMARMOR) - languages = list(/datum/language/newpsydonic) - category_tags = list(CTAG_MERCENARY) - total_positions = 2 - - cmode_music = 'sound/music/cmode/combat_grenzelhoft.ogg' - -/datum/outfit/mercenary/grenzelhoft - name = "Grenzelhoft (Mercenary)" - neck = /obj/item/clothing/neck/chaincoif - pants = /obj/item/clothing/pants/grenzelpants - shoes = /obj/item/clothing/shoes/rare/grenzelhoft - gloves = /obj/item/clothing/gloves/angle/grenzel - belt = /obj/item/storage/belt/leather/mercenary - shirt = /obj/item/clothing/shirt/grenzelhoft - head = /obj/item/clothing/head/helmet/skullcap/grenzelhoft - armor = /obj/item/clothing/armor/cuirass/grenzelhoft - -/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) - . = ..() - if(H.gender == FEMALE) - H.underwear = "Femleotard" - H.underwear_color = CLOTHING_SOOT_BLACK - H.update_body() - -/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) - . = ..() - H.merctype = 2 - if(H.dna?.species.id == SPEC_ID_HUMEN) - H.dna.species.native_language = "Old Psydonic" - H.dna.species.accent_language = H.dna.species.get_accent(H.dna.species.native_language) - -/datum/job/advclass/mercenary/grenzelhoft/on_roundstart(mob/living/carbon/human/spawned, client/player_client) - . = ..() - var/static/list/weapons = list("Zweihander", "Musket", "Halberd") - var/weapon_choice = tgui_input_list(player_client,"CHOOSE YOUR WEAPON.", "GO EARN SOME COIN.", weapons) - switch(weapon_choice) - if("Zweihander") - spawned.equip_to_slot_or_del(new /obj/item/weapon/sword/long/greatsword/zwei, ITEM_SLOT_BACK_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, ITEM_SLOT_BACK_L, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/storage/belt/pouch/coins/poor, ITEM_SLOT_BELT_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/weapon/mace/cudgel, ITEM_SLOT_BELT_L, TRUE) - spawned.attributes?.add_sheet(/datum/attribute_holder/sheet/job/grenzelhoft/zwei) - if("Musket") - spawned.equip_to_slot_or_del(new /obj/item/gun/ballistic/powder/musket, ITEM_SLOT_BACK_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/ammo_holder/bullet/bullets, ITEM_SLOT_BELT_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/musketeer, ITEM_SLOT_BACK_L, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/weapon/sword/sabre/dec, ITEM_SLOT_BELT_L, TRUE) - spawned.attributes?.add_sheet(/datum/attribute_holder/sheet/job/grenzelhoft/musket) - if("Halberd") - spawned.equip_to_slot_or_del(new /obj/item/weapon/polearm/halberd, ITEM_SLOT_BACK_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel, ITEM_SLOT_BACK_L, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/storage/belt/pouch/coins/poor, ITEM_SLOT_BELT_R, TRUE) - spawned.equip_to_slot_or_del(new /obj/item/weapon/mace/cudgel, ITEM_SLOT_BELT_L, TRUE) - spawned.attributes?.add_sheet(/datum/attribute_holder/sheet/job/grenzelhoft/halberd) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm new file mode 100644 index 00000000000..549935ed419 --- /dev/null +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm @@ -0,0 +1,59 @@ +/datum/attribute_holder/sheet/job/grenzelhoftgun + raw_attribute_list = list( + STAT_PERCEPTION = 2, //use musket from a range! + STAT_SPEED = -2, // fuck you no running! + /datum/attribute/skill/misc/swimming = 20, + /datum/attribute/skill/misc/climbing = 30, + /datum/attribute/skill/misc/sneaking = 30, + /datum/attribute/skill/combat/wrestling = 20, + /datum/attribute/skill/misc/athletics = 30, + /datum/attribute/skill/combat/unarmed = 20, + /datum/attribute/skill/combat/firearms = 30, + /datum/attribute/skill/combat/swords = 20, + /datum/attribute/skill/craft/bombs = 10, + /datum/attribute/skill/misc/reading = 10, + /datum/attribute/skill/craft/crafting = 10, + ) +/datum/job/advclass/mercenary/grenzelhoftgun + title = "Grenzelhoft Arkebusier" + tutorial = "A Grenzelhoft Arkebusier, they specialize in blackpowder weaponry, usually seen armed with muskets. Although more frail then other mercenaries, they make up for it with the incredible strength of their equipment." + allowed_races = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_AASIMAR) + outfit = /datum/outfit/mercenary/grenzelhoftgun + + attribute_sheet = /datum/attribute_holder/sheet/job/grenzelhoftgun + + traits = list(TRAIT_MEDIUMARMOR) + languages = list(/datum/language/newpsydonic) + category_tags = list(CTAG_MERCENARY) + total_positions = 2 //strong gun so limited + + cmode_music = 'sound/music/cmode/combat_grenzelhoft.ogg' + +/datum/outfit/mercenary/grenzelhoftgun + name = "Grenzelhoft Arkebusier (Mercenary)" + neck = /obj/item/clothing/neck/chaincoif + pants = /obj/item/clothing/pants/grenzelpants + shoes = /obj/item/clothing/shoes/rare/grenzelhoft + gloves = /obj/item/clothing/gloves/angle/grenzel + belt = /obj/item/storage/belt/leather/mercenary + shirt = /obj/item/clothing/shirt/grenzelhoft + backl = /obj/item/storage/backpack/satchel/musketeer + backr = /obj/item/gun/ballistic/powder/musket + beltl = /obj/item/weapon/sword/sabre/dec + beltr = /obj/item/ammo_holder/bullet/bullets + head = /obj/item/clothing/head/helmet/skullcap/grenzelhoft + armor = /obj/item/clothing/armor/cuirass/iron //shitty armor haha + +/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) + . = ..() + if(H.gender == FEMALE) + H.underwear = "Femleotard" + H.underwear_color = CLOTHING_SOOT_BLACK + H.update_body() + +/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) + . = ..() + H.merctype = 2 + if(H.dna?.species.id == SPEC_ID_HUMEN) + H.dna.species.native_language = "Old Psydonic" + H.dna.species.accent_language = H.dna.species.get_accent(H.dna.species.native_language) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm new file mode 100644 index 00000000000..3dbb6eb1662 --- /dev/null +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm @@ -0,0 +1,70 @@ +/datum/attribute_holder/sheet/job/grenzelhofthalb + raw_attribute_list = list( + STAT_ENDURANCE = 1, //they want to stay in the fight for longer + STAT_STRENGTH = 2, + STAT_PERCEPTION = 1, //direct pokes + /datum/attribute/skill/misc/swimming = 20, + /datum/attribute/skill/misc/climbing = 30, + /datum/attribute/skill/misc/sneaking = 30, + /datum/attribute/skill/combat/wrestling = 20, + /datum/attribute/skill/misc/athletics = 30, + /datum/attribute/skill/combat/unarmed = 20, + /datum/attribute/skill/combat/polearms = 30, + /datum/attribute/skill/combat/swords = 25, // their secondary weapon, could afford more training then the gun user + /datum/attribute/skill/misc/reading = 10, + /datum/attribute/skill/craft/cooking = 10, + ) +/datum/job/advclass/mercenary/grenzelhofthalb + title = "Grenzelhoft Hellebardiere" + tutorial = "A Grenzelhoft Halberdier, specializing in the usage of polearms. They make up the majority of the Grenzelhoft mercenary guild, and are known for their reliability." + allowed_races = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_AASIMAR) + outfit = /datum/outfit/mercenary/grenzelhofthalb + + attribute_sheet = /datum/attribute_holder/sheet/job/grenzelhofthalb + + traits = list(TRAIT_MEDIUMARMOR) + languages = list(/datum/language/newpsydonic) + category_tags = list(CTAG_MERCENARY) + + cmode_music = 'sound/music/cmode/combat_grenzelhoft.ogg' + +/datum/outfit/mercenary/grenzelhofthalb + name = "Grenzelhoft Hellebardiere (Mercenary)" + neck = /obj/item/clothing/neck/chaincoif + pants = /obj/item/clothing/pants/grenzelpants + shoes = /obj/item/clothing/shoes/rare/grenzelhoft + gloves = /obj/item/clothing/gloves/angle/grenzel + belt = /obj/item/storage/belt/leather/mercenary + shirt = /obj/item/clothing/shirt/grenzelhoft + beltr = /obj/item/weapon/sword/short + backl = /obj/item/storage/backpack/satchel + backr = /obj/item/weapon/polearm/halberd + backpack_contents = list( + /obj/item/storage/belt/pouch/coins/poor = 1, + /obj/item/weapon/knife/villager = 1, //utility knife! + ) +/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) + . = ..() + if(H.gender == FEMALE) + H.underwear = "Femleotard" + H.underwear_color = CLOTHING_SOOT_BLACK + H.update_body() + +/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) + . = ..() + H.merctype = 2 + if(H.dna?.species.id == SPEC_ID_HUMEN) + H.dna.species.native_language = "Old Psydonic" + H.dna.species.accent_language = H.dna.species.get_accent(H.dna.species.native_language) + +/datum/job/advclass/mercenary/grenzelhofthalb/on_roundstart(mob/living/carbon/human/spawned, client/player_client) + . = ..() + var/static/list/armor = list("Blacksteel Cuirass + Skullcap", "Steel Cuirass + Sallet") + var/armor_choice = tgui_input_list(player_client,"CHOOSE YOUR MAILLE", "GO EARN SOME COIN.", armor) + switch(armor_choice) + if("Blacksteel Cuirass + Skullcap") + spawned.equip_to_slot_or_del(new /obj/item/clothing/armor/cuirass/grenzelhoft, ITEM_SLOT_ARMOR, TRUE) + spawned.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/skullcap/grenzelhoft, ITEM_SLOT_HEAD, TRUE) + if("Steel Cuirass + Sallet") + spawned.equip_to_slot_or_del(new /obj/item/clothing/armor/cuirass, ITEM_SLOT_ARMOR, TRUE) + spawned.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/sallet, ITEM_SLOT_HEAD, TRUE) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm new file mode 100644 index 00000000000..03ae17d2296 --- /dev/null +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm @@ -0,0 +1,61 @@ +/datum/attribute_holder/sheet/job/grenzelhoftzwei + raw_attribute_list = list( + STAT_CONSTITUTION = 2, + STAT_STRENGTH = 2, + /datum/attribute/skill/misc/swimming = 20, + /datum/attribute/skill/misc/climbing = 30, + /datum/attribute/skill/misc/sneaking = 30, + /datum/attribute/skill/combat/wrestling = 20, + /datum/attribute/skill/misc/athletics = 35, // slight bonus, they use big sword + /datum/attribute/skill/combat/unarmed = 20, + /datum/attribute/skill/combat/swords = 30, + /datum/attribute/skill/combat/whipsflails = 10, + /datum/attribute/skill/combat/shields = 10, + /datum/attribute/skill/misc/reading = 10, + /datum/attribute/skill/misc/medicine = 10, + ) +/datum/job/advclass/mercenary/grenzelhoftzwei + title = "Grenzelhoft Doppelsöldner" + tutorial = "A Grenzelhoft Doppelsöldner, specializing in using Zweihanders to break through enemy pike formations. This expertise generally demands high pay, which has given them the name of 'double-pay men'." + allowed_races = list(SPEC_ID_HUMEN, SPEC_ID_DWARF, SPEC_ID_AASIMAR) + outfit = /datum/outfit/mercenary/grenzelhoftzwei + + attribute_sheet = /datum/attribute_holder/sheet/job/grenzelhoftzwei + + traits = list(TRAIT_MEDIUMARMOR, TRAIT_STEELHEARTED) // these guys are in the frontline. they see bloody shit and are used to it. + languages = list(/datum/language/newpsydonic) + category_tags = list(CTAG_MERCENARY) + + cmode_music = 'sound/music/cmode/combat_grenzelhoft.ogg' + +/datum/outfit/mercenary/grenzelhoftzwei + name = "Grenzelhoft Doppelsoldner (Mercenary)" + neck = /obj/item/clothing/neck/gorget //no double padding for your helmet, its a weak spot! + pants = /obj/item/clothing/pants/grenzelpants + shoes = /obj/item/clothing/shoes/rare/grenzelhoft + gloves = /obj/item/clothing/gloves/angle/grenzel + belt = /obj/item/storage/belt/leather/mercenary + shirt = /obj/item/clothing/shirt/grenzelhoft + wrists = /obj/item/clothing/wrists/bracers/iron //bonus arm protection so you dont get your arms chopped off! + backl = /obj/item/storage/backpack/satchel + backr = /obj/item/weapon/sword/long/greatsword/zwei + head = /obj/item/clothing/head/helmet/skullcap/grenzelhoft + armor = /obj/item/clothing/armor/cuirass/grenzelhoft + backpack_contents = list( + /obj/item/storage/belt/pouch/coins/poor = 1, + /obj/item/weapon/knife/villager = 1, //utility knife! + /obj/item/weapon/mace/cudgel //all of this spawns in their bag because of stuff that spawns things on your hip + ) +/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) + . = ..() + if(H.gender == FEMALE) + H.underwear = "Femleotard" + H.underwear_color = CLOTHING_SOOT_BLACK + H.update_body() + +/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) + . = ..() + H.merctype = 2 + if(H.dna?.species.id == SPEC_ID_HUMEN) + H.dna.species.native_language = "Old Psydonic" + H.dna.species.accent_language = H.dna.species.get_accent(H.dna.species.native_language) diff --git a/vanderlin.dme b/vanderlin.dme index 483b27659d6..6b716f0fe67 100644 --- a/vanderlin.dme +++ b/vanderlin.dme @@ -3175,7 +3175,9 @@ #include "code\modules\jobs\job_types\other\merc_classes\expegasusknight.dm" #include "code\modules\jobs\job_types\other\merc_classes\gallowglass.dm" #include "code\modules\jobs\job_types\other\merc_classes\gloryhound.dm" -#include "code\modules\jobs\job_types\other\merc_classes\grenzelhoft.dm" +#include "code\modules\jobs\job_types\other\merc_classes\grenzelhoftgun.dm" +#include "code\modules\jobs\job_types\other\merc_classes\grenzelhofthalb.dm" +#include "code\modules\jobs\job_types\other\merc_classes\grenzelhoftzwei.dm" #include "code\modules\jobs\job_types\other\merc_classes\hollowdragoon.dm" #include "code\modules\jobs\job_types\other\merc_classes\ironmaiden.dm" #include "code\modules\jobs\job_types\other\merc_classes\kern.dm" From 312df46966d5a73de9182536b8fbcfe0dd8bd5c9 Mon Sep 17 00:00:00 2001 From: ApolloVector <149586366+ApolloVector@users.noreply.github.com> Date: Thu, 28 May 2026 21:25:34 -0700 Subject: [PATCH 2/4] fix shit accents + no more NOPE appearing! --- _maps/map_files/rosewood/map_adjustment_rosewood.dm | 4 +++- .../whitepalacepass/map_adjustment_whitepalacepass.dm | 4 +++- .../jobs/job_types/other/merc_classes/grenzelhoftgun.dm | 4 ++-- .../jobs/job_types/other/merc_classes/grenzelhofthalb.dm | 2 +- .../jobs/job_types/other/merc_classes/grenzelhoftzwei.dm | 4 ++-- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/_maps/map_files/rosewood/map_adjustment_rosewood.dm b/_maps/map_files/rosewood/map_adjustment_rosewood.dm index 035ff15cc75..4c8c32c3a24 100644 --- a/_maps/map_files/rosewood/map_adjustment_rosewood.dm +++ b/_maps/map_files/rosewood/map_adjustment_rosewood.dm @@ -32,7 +32,9 @@ /datum/job/orthodoxist, // RACES_PLAYER_GRENZ /datum/job/advclass/combat/swordmaster, - /datum/job/advclass/mercenary/grenzelhoft, + /datum/job/advclass/mercenary/grenzelhoftzwei, + /datum/job/advclass/mercenary/grenzelhofthalb, + /datum/job/advclass/mercenary/grenzelhoftgun, /datum/job/advclass/pilgrim/rare/grenzelhoft, /datum/job/advclass/pilgrim/rare/preacher, ) diff --git a/_maps/map_files/whitepalacepass/map_adjustment_whitepalacepass.dm b/_maps/map_files/whitepalacepass/map_adjustment_whitepalacepass.dm index d36bb7a2cca..f577d80698c 100644 --- a/_maps/map_files/whitepalacepass/map_adjustment_whitepalacepass.dm +++ b/_maps/map_files/whitepalacepass/map_adjustment_whitepalacepass.dm @@ -8,7 +8,9 @@ map_file_name = "WhitePalacePass.dmm" blacklist = list( /datum/job/adept, - /datum/job/advclass/mercenary/grenzelhoft, + /datum/job/advclass/mercenary/grenzelhoftzwei, + /datum/job/advclass/mercenary/grenzelhofthalb, + /datum/job/advclass/mercenary/grenzelhoftgun, /datum/job/advclass/pilgrim/rare/grenzelhoft, /datum/job/advclass/pilgrim/rare/preacher, /datum/job/advclass/combat/swordmaster, diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm index 549935ed419..0961cff81ca 100644 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm @@ -44,14 +44,14 @@ head = /obj/item/clothing/head/helmet/skullcap/grenzelhoft armor = /obj/item/clothing/armor/cuirass/iron //shitty armor haha -/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) +/datum/outfit/mercenary/grenzelhoftgun/pre_equip(mob/living/carbon/human/H) . = ..() if(H.gender == FEMALE) H.underwear = "Femleotard" H.underwear_color = CLOTHING_SOOT_BLACK H.update_body() -/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) +/datum/job/advclass/mercenary/grenzelhoftgun/after_spawn(mob/living/carbon/human/H) . = ..() H.merctype = 2 if(H.dna?.species.id == SPEC_ID_HUMEN) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm index 3dbb6eb1662..d8f9032ab81 100644 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm @@ -50,7 +50,7 @@ H.underwear_color = CLOTHING_SOOT_BLACK H.update_body() -/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) +/datum/job/advclass/mercenary/grenzelhofthalb/after_spawn(mob/living/carbon/human/H) . = ..() H.merctype = 2 if(H.dna?.species.id == SPEC_ID_HUMEN) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm index 03ae17d2296..03424455b4e 100644 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftzwei.dm @@ -46,14 +46,14 @@ /obj/item/weapon/knife/villager = 1, //utility knife! /obj/item/weapon/mace/cudgel //all of this spawns in their bag because of stuff that spawns things on your hip ) -/datum/outfit/mercenary/grenzelhoft/pre_equip(mob/living/carbon/human/H) +/datum/outfit/mercenary/grenzelhoftzwei/pre_equip(mob/living/carbon/human/H) . = ..() if(H.gender == FEMALE) H.underwear = "Femleotard" H.underwear_color = CLOTHING_SOOT_BLACK H.update_body() -/datum/job/advclass/mercenary/grenzelhoft/after_spawn(mob/living/carbon/human/H) +/datum/job/advclass/mercenary/grenzelhoftzwei/after_spawn(mob/living/carbon/human/H) . = ..() H.merctype = 2 if(H.dna?.species.id == SPEC_ID_HUMEN) From 31a5cedb0ad9f2c7a5f6b1a97fcdd7bedde172da Mon Sep 17 00:00:00 2001 From: Archeon <149586366+Archeonan@users.noreply.github.com> Date: Thu, 28 May 2026 22:08:11 -0700 Subject: [PATCH 3/4] armor name change --- .../jobs/job_types/other/merc_classes/grenzelhofthalb.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm index d8f9032ab81..14554473562 100644 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhofthalb.dm @@ -59,10 +59,10 @@ /datum/job/advclass/mercenary/grenzelhofthalb/on_roundstart(mob/living/carbon/human/spawned, client/player_client) . = ..() - var/static/list/armor = list("Blacksteel Cuirass + Skullcap", "Steel Cuirass + Sallet") + var/static/list/armor = list("Grenzelhoft Cuirass & Grenzelhoft Plume Hat", "Steel Cuirass + Sallet") var/armor_choice = tgui_input_list(player_client,"CHOOSE YOUR MAILLE", "GO EARN SOME COIN.", armor) switch(armor_choice) - if("Blacksteel Cuirass + Skullcap") + if("Grenzelhoft Cuirass & Grenzelhoft Plume Hat") spawned.equip_to_slot_or_del(new /obj/item/clothing/armor/cuirass/grenzelhoft, ITEM_SLOT_ARMOR, TRUE) spawned.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/skullcap/grenzelhoft, ITEM_SLOT_HEAD, TRUE) if("Steel Cuirass + Sallet") From a7f6195350daa2ae99c6cf8dd851d8cb9f1f2982 Mon Sep 17 00:00:00 2001 From: Archeon <149586366+Archeonan@users.noreply.github.com> Date: Thu, 28 May 2026 22:09:05 -0700 Subject: [PATCH 4/4] better armor for arkebusier --- .../modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm index 0961cff81ca..ba2ecbbcc78 100644 --- a/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm +++ b/code/modules/jobs/job_types/other/merc_classes/grenzelhoftgun.dm @@ -42,7 +42,7 @@ beltl = /obj/item/weapon/sword/sabre/dec beltr = /obj/item/ammo_holder/bullet/bullets head = /obj/item/clothing/head/helmet/skullcap/grenzelhoft - armor = /obj/item/clothing/armor/cuirass/iron //shitty armor haha + armor = /obj/item/clothing/armor/cuirass/grenzelhoft //bad stats so they cna keep the strong armor /datum/outfit/mercenary/grenzelhoftgun/pre_equip(mob/living/carbon/human/H) . = ..()