diff --git a/code/__defines/faction_lang_defines.dm b/code/__defines/faction_lang_defines.dm index 97d7896c24..b55db64341 100644 --- a/code/__defines/faction_lang_defines.dm +++ b/code/__defines/faction_lang_defines.dm @@ -123,6 +123,12 @@ else return "Dutch Republic" + if (constant == ITALIAN) + if (age >= 7) + return "Italian Republic" + else + return "Italian Monarchy" + if (constant == JAPANESE) return "Japanese Empire" diff --git a/code/modules/1713/jobs/italian.dm b/code/modules/1713/jobs/italian.dm index 0103211550..7e140adbc8 100644 --- a/code/modules/1713/jobs/italian.dm +++ b/code/modules/1713/jobs/italian.dm @@ -20,27 +20,45 @@ /datum/job/italian/soldier/equip(var/mob/living/human/H) if (!H) return FALSE //shoes - H.equip_to_slot_or_del(new /obj/item/clothing/shoes/blackboots(H), slot_shoes) + H.equip_to_slot_or_del(new /obj/item/clothing/shoes/jackboots(H), slot_shoes) //clothes - H.equip_to_slot_or_del(new /obj/item/clothing/under/ww1/german(H), slot_w_uniform) + H.equip_to_slot_or_del(new /obj/item/clothing/under/ww2/german(H), slot_w_uniform) + //head - H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww/pickelhaube2(H), slot_head) + if (prob(50)) + H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww2/gerhelm(H), slot_head) + else + H.equip_to_slot_or_del(new /obj/item/clothing/head/ww2/german_fieldcap(H), slot_head) //back - H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/gewehr98(H), slot_shoulder) - H.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/german(H), slot_belt) var/obj/item/clothing/under/uniform = H.w_uniform - var/obj/item/clothing/accessory/storage/webbing/ww1/german/fullwebbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german(null) - uniform.attackby(fullwebbing, H) + var/randimpw = rand(1,5) + switch(randimpw) + if (1) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/semiautomatic/g41(H), slot_shoulder) + var/obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98/sniper/webbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98/sniper(null) + uniform.attackby(webbing, H) + if (2) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/submachinegun/mp40(H), slot_shoulder) + var/obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/mp40/webbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/mp40(null) + uniform.attackby(webbing, H) + if (3) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/semiautomatic/g43(H), slot_shoulder) + var/obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/g43/webbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/g43(null) + uniform.attackby(webbing, H) + if (4) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/boltaction/gewehr98(H), slot_shoulder) + var/obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98/webbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98(null) + uniform.attackby(webbing, H) + if (5) + H.equip_to_slot_or_del(new /obj/item/weapon/gun/projectile/semiautomatic/g41(H), slot_shoulder) + var/obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98/webbing = new /obj/item/clothing/accessory/storage/webbing/ww1/german/ww2/gewehr98(null) + uniform.attackby(webbing, H) + + if (time_of_day == "Night" || time_of_day == "Evening" || time_of_day == "Early Morning") + if (prob(50)) + H.equip_to_slot_or_del(new /obj/item/flashlight/militarylight/alt(H), slot_wear_id) give_random_name(H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) - fullwebbing.attackby(new/obj/item/ammo_magazine/gewehr98, H) H.add_note("Role", "You are a [title], a simple soldier of the Royal Italian Army. Follow your Sergeant's orders!") H.setStat("strength", STAT_MEDIUM_HIGH) H.setStat("crafting", STAT_MEDIUM_LOW) diff --git a/icons/mob/hud_1713.dmi b/icons/mob/hud_1713.dmi index d3a3f86892..22094d41c2 100644 Binary files a/icons/mob/hud_1713.dmi and b/icons/mob/hud_1713.dmi differ