Merge pull request Civ13#2523 from KanohaShinobi/master

fallschirmjager
Bierkraan · Jan 9, 2024 · f7a63b8 · f7a63b8
2 parents fec7311 + f9d9dd2
commit f7a63b8
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 1 deletion.
diff --git a/code/modules/1713/apparel_worldwars.dm b/code/modules/1713/apparel_worldwars.dm
@@ -2535,6 +2535,14 @@ obj/item/clothing/accessory/storage/webbing/ww1/ww2/stormgroup/Scout
 	flags_inv = BLOCKHEADHAIR
 	armor = list(melee = 40, arrow = 30, gun = 10, energy = 15, bomb = 40, bio = 20, rad = FALSE)
 
+/obj/item/clothing/head/helmet/ww2/gerhelm/paratrooper
+	name = "Fallschirmjager stahlhelm"
+	desc = "A fallschirmjager helmet."
+	icon_state = "stahlhelm_para"
+	item_state = "stahlhelm_para"
+	worn_state = "stahlhelm_para"
+	armor = list(melee = 35, arrow = 30, gun = 10, energy = 15, bomb = 35, bio = 20, rad = FALSE)
+
 /obj/item/clothing/head/helmet/ww2/gerhelm_medic
 	name = "german medic stahlhelm"
 	desc = "The typical rounded steel helmet of the Wehrmacht, this one belonging to a medic."

diff --git a/code/modules/1713/jobs/german.dm b/code/modules/1713/jobs/german.dm
@@ -1964,7 +1964,7 @@
 //clothes
 	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/ww2/gerhelm(H), slot_head)
+	H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/ww2/gerhelm/paratrooper(H), slot_head)
 //back
 	var/obj/item/clothing/under/uniform = H.w_uniform
 	var/randimpw = rand(1,4)

diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
diff --git a/icons/obj/gun_att.dmi b/icons/obj/gun_att.dmi
diff --git a/icons/obj/guns/automatic.dmi b/icons/obj/guns/automatic.dmi