IJN

added Imperial Japanese Navy and the Kurama destroyer

code/game/mob/living/carbon/human/corpse.dm

@@ -305,6 +305,72 @@ mob/living/human/corpse/british_sailor
 		spawn (50) // must be here or they won't spawn, it seems - Kachnov
 			death()
 
+/mob/living/human/corpse/ww2_jap_seaman
+	gender = MALE
+
+/mob/living/human/corpse/ww2_jap_seaman/New()
+	..()
+	icon_state = "human_m_s"
+	var/spawntime = 0
+	invisibility = 101
+	if (!job_master)
+		spawntime = 5
+	spawn (spawntime)
+		if (!job_master)
+			qdel(src)
+			return
+		job_master.EquipRank(src, "Santosuihei")
+		dir = pick(NORTH,SOUTH,EAST,WEST)
+		adjustBruteLoss(rand(6,7))
+		name = "Japanese Seaman"
+		invisibility = 0
+		spawn (50) // must be here or they won't spawn, it seems - Kachnov
+			death()
+
+/mob/living/human/corpse/ww2_jap_seaman_po
+	gender = MALE
+
+/mob/living/human/corpse/ww2_jap_seaman_po/New()
+	..()
+	icon_state = "human_m_s"
+	var/spawntime = 0
+	invisibility = 101
+	if (!job_master)
+		spawntime = 5
+	spawn (spawntime)
+		if (!job_master)
+			qdel(src)
+			return
+		job_master.EquipRank(src, "Kaigun Nitoheiso")
+		dir = pick(NORTH,SOUTH,EAST,WEST)
+		adjustBruteLoss(rand(6,7))
+		name = "Japanese Petty Officer"
+		invisibility = 0
+		spawn (50) // must be here or they won't spawn, it seems - Kachnov
+			death()
+
+/mob/living/human/corpse/ww2_jap_seaman_officer
+	gender = MALE
+
+/mob/living/human/corpse/ww2_jap_seaman_officer/New()
+	..()
+	icon_state = "human_m_s"
+	var/spawntime = 0
+	invisibility = 101
+	if (!job_master)
+		spawntime = 5
+	spawn (spawntime)
+		if (!job_master)
+			qdel(src)
+			return
+		job_master.EquipRank(src, "Kaigun-Dai-i")
+		dir = pick(NORTH,SOUTH,EAST,WEST)
+		adjustBruteLoss(rand(6,7))
+		name = "Japanese Naval Officer"
+		invisibility = 0
+		spawn (50) // must be here or they won't spawn, it seems - Kachnov
+			death()
+
 /mob/living/human/corpse/ww2_jap_medic
 	gender = MALE
 

code/game/mob/living/simple_animal/hostile/russo-jap.dm

@@ -156,6 +156,80 @@
 		icon_state = "ww2_jap_ranged_summer_sl"
 		gun = new/obj/item/weapon/gun/projectile/submachinegun/type100(src)
 
+/mob/living/simple_animal/hostile/human/ww2_jap/seaman
+	name = "Japanese Seaman"
+	icon_state = "japnavy"
+	corpse = /mob/living/human/corpse/ww2_jap_seaman
+	rapid = 0
+	grenades = 0
+	ranged = 0
+	attacktext = "punched"
+	attack_sound = 'sound/weapons/punch3.ogg'
+	emote_see = list("raises his fists")
+	New()
+		..()
+		icon_state = "japnavy_dead"
+		messages["injured"] = list("!!Medic!","!!AAARGH!")
+		messages["backup"] =list( "!!Help me!","!!On me!")
+		messages["enemy_sighted"] = list("!!Contact!","!!Enemy spotted!")
+		messages["grenade"] = list("!!GRENADE!!!", "!!Grenade, run!!")
+
+/mob/living/simple_animal/hostile/human/ww2_jap/seaman/ranged
+	name = "Japanese Seaman"
+	icon_state = "japnavy_ranged"
+	corpse = /mob/living/human/corpse/ww2_jap_seaman
+	rapid = 0
+	grenades = 1
+	ranged = 1
+	attacktext = "Bayoneted"
+	attack_sound = 'sound/weapons/slice.ogg'
+	emote_see = list("aims", "raises his rifle")
+	New()
+		..()
+		icon_state = "japnavy_dead"
+		gun = new/obj/item/weapon/gun/projectile/boltaction/arisaka99/bayonet(src)
+
+/mob/living/simple_animal/hostile/human/ww2_jap/seaman/po
+	name = "Japanese Petty Officer"
+	icon_state = "japnavy_po"
+	corpse = /mob/living/human/corpse/ww2_jap_seaman_po
+	rapid = 0
+	grenades = 0
+	ranged = 0
+	attacktext = "punched"
+	attack_sound = 'sound/weapons/punch3.ogg'
+	emote_see = list("raises his fists")
+	role = "officer"
+	New()
+		..()
+		icon_state = "japnavy_dead"
+		messages["injured"] = list("!!Medic!","!!AAARGH!")
+		messages["backup"] =list( "!!Get over here!","!!On me!")
+		messages["enemy_sighted"] = list("!!Contact!","!!Enemy spotted!")
+		messages["grenade"] = list("!!GRENADE!!!", "!!Grenade, run!!")
+
+/mob/living/simple_animal/hostile/human/ww2_jap/seaman/officer
+	name = "Japanese Petty Officer"
+	icon_state = "japnavy_officer"
+	corpse = /mob/living/human/corpse/ww2_jap_seaman_officer
+	rapid = 0
+	grenades = 0
+	ranged = 1
+	attacktext = "punched"
+	attack_sound = 'sound/weapons/punch3.ogg'
+	emote_see = list("aims", "raises his pistol")
+	role = "officer"
+	projectiletype = /obj/item/projectile/bullet/pistol/c8mmnambu
+	New()
+		..()
+		icon_state = "japnavy_dead"
+		messages["injured"] = list("!!You bastard!","!!AAARGH!")
+		messages["backup"] =list( "!!Get over here!","!!On me!")
+		messages["enemy_sighted"] = list("!!Contact!","!!Enemy spotted!")
+		messages["grenade"] = list("!!GRENADE!!!", "!!Grenade!!")
+		gun = new/obj/item/weapon/gun/projectile/pistol/ww2/nambu(src)
+
+
 /mob/living/simple_animal/hostile/human/ww2_american
 	name = "American Soldier"
 	desc = "An american soldier! he looks hostile!"

code/modules/1713/apparel_worldwars.dm

@@ -565,6 +565,27 @@
 		return
 
 
+/obj/item/clothing/head/ww2/japcap_navy_officer
+	name = "japanese naval officer cap"
+	desc = "A cap worn by japanese officers in the navy."
+	icon_state = "ww2_japcap_navy_officer"
+	item_state = "ww2_japcap_navy_officer"
+	worn_state = "ww2_japcap_navy_officer"
+
+/obj/item/clothing/head/ww2/japcap_navy_po
+	name = "japanese petty officer cap"
+	desc = "A cap worn by japanese petty officers in the navy."
+	icon_state = "ww2_japcap_navy"
+	item_state = "ww2_japcap_navy"
+	worn_state = "ww2_japcap_navy"
+
+/obj/item/clothing/head/ww2/japcap_navy_cap
+	name = "japanese sailor cap"
+	desc = "A cap worn by japanese seamen."
+	icon_state = "japanese_sailor_hat"
+	item_state = "japanese_sailor_hat"
+	worn_state = "japanese_sailor_hat"
+
 /obj/item/clothing/head/ww2/japcap_snlf
 	name = "japanese cap"
 	desc = "A cap worn by japanese soldiers in the SNLF."
@@ -809,6 +830,54 @@
 	..()
 	update_clothing_icon()
 
+/obj/item/clothing/under/ww2/japuni_navy
+	name = "japanese naval uniform"
+	desc = "A imperial japanese navy uniform."
+	icon_state = "ww2_japuni_navy"
+	item_state = "ww2_japuni_navy"
+	worn_state = "ww2_japuni_navy"
+	var/rolled = FALSE
+
+/obj/item/clothing/under/ww2/japuni_navy/verb/roll_sleeves()
+	set category = null
+	set src in usr
+	if (type != /obj/item/clothing/under/ww2/japuni_navy)
+		return
+	else
+		if (rolled)
+			worn_state = "japuni_navy"
+			item_state = "japuni_navy"
+			icon_state = "japuni_navy"
+			item_state_slots["w_uniform"] = "japuni_navy"
+			usr << "<span class = 'danger'>You roll down your uniform's sleeves.</span>"
+			rolled = FALSE
+			cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS
+			update_clothing_icon()
+		else if (!rolled)
+			worn_state = "japuni_navy_rolled"
+			item_state = "japuni_navy_rolled"
+			icon_state = "japuni_navy_rolled"
+			item_state_slots["w_uniform"] = "japuni_navy_rolled"
+			usr << "<span class = 'danger'>You roll up your uniform's sleeves.</span>"
+			rolled = TRUE
+			heat_protection = ARMS
+			cold_protection = UPPER_TORSO|LOWER_TORSO|LEGS
+			update_clothing_icon()
+
+/obj/item/clothing/under/ww2/japuni_navy_po
+	name = "japanese naval petty officer uniform"
+	desc = "A imperial japanese naval petty officer uniform."
+	icon_state = "ww2_japuni_navy_po"
+	item_state = "ww2_japuni_navy_po"
+	worn_state = "ww2_japuni_navy_po"
+
+/obj/item/clothing/under/ww2/japuni_navy_officer
+	name = "japanese naval officer uniform"
+	desc = "A imperial japanese naval officer uniform."
+	icon_state = "ww2_japuni_navy_officer"
+	item_state = "ww2_japuni_navy_officer"
+	worn_state = "ww2_japuni_navy_officer"
+
 /obj/item/clothing/under/ww2/japuni_snlf
 	name = "japanese uniform"
 	desc = "A imperial japanese SNLF uniform."

code/modules/1713/vending.dm

@@ -445,6 +445,24 @@
 	name = "Imperial Japanese Army apparel rack"
 	desc = "Basic wear for soldiers of the Imperial Japanese Special Navy Landing Force."
 	icon_state = "apparel_japan_ww2"
+	products = list(
+		/obj/item/clothing/shoes/heavyboots/wrappedboots = 15,
+		/obj/item/clothing/under/ww2/japuni_snlf = 15,
+		/obj/item/clothing/head/ww2/japcap_snlf = 15,
+		/obj/item/clothing/head/helmet/ww2/japhelm_snlf = 15,
+		/obj/item/clothing/head/ww2/jap_headband = 10,
+		/obj/item/stack/medical/bruise_pack/bint = 10,
+		/obj/item/flashlight/japflashlight = 15,
+		/obj/item/weapon/material/shovel/trench = 10,
+		/obj/item/weapon/reagent_containers/food/drinks/bottle/canteen/ww2/jap = 30,
+		/obj/item/weapon/reagent_containers/food/snacks/MRE/generic/japanese = 50,
+		/obj/item/havelock = 40,
+		/obj/item/puttees = 40,
+	)
+/obj/structure/vending/japaneseapparel_ww2_navy
+	name = "Imperial Japanese Navy apparel rack"
+	desc = "Basic wear for soldiers of the Imperial Japanese Navy."
+	icon_state = "apparel_japan_ww2"
 	products = list(
 		/obj/item/clothing/shoes/heavyboots/wrappedboots = 15,
 		/obj/item/clothing/under/ww2/japuni_snlf = 15,