From 7f6a4e75632f50da6a42d6487444ec5b05afdba1 Mon Sep 17 00:00:00 2001 From: savethetreez Date: Sat, 13 Apr 2024 22:34:27 +0200 Subject: [PATCH] Fixes Greek and Italian SLs Greeks are missing an officer role though... --- code/modules/1713/jobs/greek.dm | 9 +++------ code/modules/1713/jobs/italian.dm | 6 ++++-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/code/modules/1713/jobs/greek.dm b/code/modules/1713/jobs/greek.dm index 849c8dba08..d0feac5713 100644 --- a/code/modules/1713/jobs/greek.dm +++ b/code/modules/1713/jobs/greek.dm @@ -171,6 +171,8 @@ give_random_name(H) return TRUE +/// WW2 /// + /datum/job/greek/squad_leader_ww2 title = "Dekaneas" en_meaning = "Squad Leader" @@ -178,6 +180,7 @@ spawn_location = "JoinLateGR" is_squad_leader = TRUE + uses_squads = TRUE is_ww2 = TRUE min_positions = 2 @@ -211,8 +214,6 @@ H.setStat("pistol", STAT_NORMAL) H.setStat("bows", STAT_NORMAL) H.setStat("medical", STAT_MEDIUM_LOW) - - return TRUE /datum/job/greek/soldier_ww2 @@ -275,8 +276,6 @@ H.setStat("pistol", STAT_NORMAL) H.setStat("bows", STAT_NORMAL) H.setStat("medical", STAT_MEDIUM_LOW) - - return TRUE /datum/job/greek/medic_ww2 @@ -329,6 +328,4 @@ H.setStat("pistol", STAT_NORMAL) H.setStat("bows", STAT_NORMAL) H.setStat("medical", STAT_MEDIUM_LOW) - - return TRUE \ No newline at end of file diff --git a/code/modules/1713/jobs/italian.dm b/code/modules/1713/jobs/italian.dm index ad537982ae..768621fb35 100644 --- a/code/modules/1713/jobs/italian.dm +++ b/code/modules/1713/jobs/italian.dm @@ -5,7 +5,7 @@ H.name = H.species.get_random_italian_name(H.gender) H.real_name = H.name -/datum/job/italian/squad_leader +/datum/job/italian/officer title = "Tenente" en_meaning = "Officer" rank_abbreviation = "Ten." @@ -13,11 +13,12 @@ spawn_location = "JoinLateIT" is_officer = TRUE whitelisted = TRUE + is_commander = TRUE min_positions = 1 max_positions = 1 -/datum/job/italian/squad_leader/equip(var/mob/living/human/H) +/datum/job/italian/officer/equip(var/mob/living/human/H) if (!H) return FALSE //shoes H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) @@ -56,6 +57,7 @@ spawn_location = "JoinLateIT" is_squad_leader = TRUE + uses_squads = TRUE is_ww2 = TRUE min_positions = 2